diff --git a/Theme/Backend/dashboard.tpl.php b/Theme/Backend/dashboard.tpl.php
index a9ad7c1..4b9844a 100644
--- a/Theme/Backend/dashboard.tpl.php
+++ b/Theme/Backend/dashboard.tpl.php
@@ -23,21 +23,21 @@ echo $this->getData('nav')->render(); ?>
 
 <section class="box w-100">
     <ul class="btns floatLeft">
-        <li><a href="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/backend/messages/mail/create'); ?>"><i class="fa fa-pencil"></i> <?= $this->l11n->lang[0]['Create']; ?></a>
-        <li><a href=""><i class="fa fa-trash"></i> <?= $this->l11n->lang[0]['Delete']; ?></a>
+        <li><a href="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/backend/messages/mail/create'); ?>"><i class="fa fa-pencil"></i> <?= $this->l11n->getText(0, 'Create'); ?></a>
+        <li><a href=""><i class="fa fa-trash"></i> <?= $this->l11n->getText(0, 'Delete'); ?></a>
     </ul>
 </section>
 
 <div class="box w-100">
     <table class="table">
-        <caption><?= $this->l11n->lang['Messages']['Messages']; ?></caption>
+        <caption><?= $this->l11n->getText('Messages', 'Messages'); ?></caption>
         <thead>
         <tr>
             <td><span class="check"><input type="checkbox"></span>
-            <td><?= $this->l11n->lang['Messages']['Tag']; ?>
-            <td class="wf-100"><?= $this->l11n->lang['Messages']['Subject']; ?>
-            <td><?= $this->l11n->lang['Messages']['From']; ?>
-            <td><?= $this->l11n->lang['Messages']['Date']; ?>
+            <td><?= $this->l11n->getText('Messages', 'Tag'); ?>
+            <td class="wf-100"><?= $this->l11n->getText('Messages', 'Subject'); ?>
+            <td><?= $this->l11n->getText('Messages', 'From'); ?>
+            <td><?= $this->l11n->getText('Messages', 'Date'); ?>
         <tfoot>
         <tr><td colspan="5"><?= \phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['usage']); ?> / <?= \phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['limit']); ?>
         <tbody>
@@ -62,7 +62,7 @@ echo $this->getData('nav')->render(); ?>
                     <?php endforeach; ?>
             <?php if($count < 1) : ?>
         <tr>
-            <td colspan="5" class="empty"><?= $this->l11n->lang[0]['Empty']; ?>
+            <td colspan="5" class="empty"><?= $this->l11n->getText(0, 'Empty'); ?>
         <?php endif; ?>
     </table>
 </div>
diff --git a/Theme/Backend/mail-create.tpl.php b/Theme/Backend/mail-create.tpl.php
index 76b0e83..d451e60 100644
--- a/Theme/Backend/mail-create.tpl.php
+++ b/Theme/Backend/mail-create.tpl.php
@@ -19,13 +19,13 @@ echo $this->getData('nav')->render(); ?>
     <div class="inner">
         <form>
             <table class="layout wf-100">
-                <tr><td style="width: 1%"><button class="simple"><i class="fa fa-book"></i></button><td><input type="text" placeholder="&#xf007; <?= $this->l11n->lang['Messages']['To']; ?>" name="to">
-                <tr><td style="width: 1%"><button class="simple"><i class="fa fa-book"></i></button><td><input type="text" placeholder="&#xf007; <?= $this->l11n->lang['Messages']['CC']; ?>" name="cc">
-                <tr><td style="width: 1%"><button class="simple"><i class="fa fa-book"></i></button><td><input type="text" placeholder="&#xf007; <?= $this->l11n->lang['Messages']['BCC']; ?>" name="bcc">
-                <tr><td><td><input type="text" placeholder="&#xf040; <?= $this->l11n->lang['Messages']['Subject']; ?>" name="subject">
+                <tr><td style="width: 1%"><button class="simple"><i class="fa fa-book"></i></button><td><input type="text" placeholder="&#xf007; <?= $this->l11n->getText('Messages', 'To'); ?>" name="to">
+                <tr><td style="width: 1%"><button class="simple"><i class="fa fa-book"></i></button><td><input type="text" placeholder="&#xf007; <?= $this->l11n->getText('Messages', 'CC'); ?>" name="cc">
+                <tr><td style="width: 1%"><button class="simple"><i class="fa fa-book"></i></button><td><input type="text" placeholder="&#xf007; <?= $this->l11n->getText('Messages', 'BCC'); ?>" name="bcc">
+                <tr><td><td><input type="text" placeholder="&#xf040; <?= $this->l11n->getText('Messages', 'Subject'); ?>" name="subject">
                 <tr><td><td><input type="file" name="files" multiple>
                 <tr><td><td><div class="textarea" contenteditable="true" style="height: 400px;"></div><textarea placeholder="&#xf040;" style="display: none" name="mail"></textarea>
-                <tr><td><td><input type="submit" value="<?= $this->l11n->lang[0]['Send']; ?>"> <input type="submit" value="<?= $this->l11n->lang[0]['Save']; ?>">
+                <tr><td><td><input type="submit" value="<?= $this->l11n->getText(0]['Send']; ?>"> <input type="submit" value="<?= $this->l11n->lang[0, 'Save'); ?>">
             </table>
         </form>
     </div>
diff --git a/Theme/Backend/mail-out-view.tpl.php b/Theme/Backend/mail-out-view.tpl.php
index 69d5c2c..de81a19 100644
--- a/Theme/Backend/mail-out-view.tpl.php
+++ b/Theme/Backend/mail-out-view.tpl.php
@@ -22,21 +22,21 @@ echo $this->getData('nav')->render(); ?>
 
 <section class="box w-100">
     <ul class="btns floatLeft">
-        <li><a href="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/backend/messages/mail/create'); ?>"><i class="fa fa-pencil"></i> <?= $this->l11n->lang[0]['Create']; ?></a>
-        <li><a href=""><i class="fa fa-trash"></i> <?= $this->l11n->lang[0]['Delete']; ?></a>
+        <li><a href="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/backend/messages/mail/create'); ?>"><i class="fa fa-pencil"></i> <?= $this->l11n->getText(0, 'Create'); ?></a>
+        <li><a href=""><i class="fa fa-trash"></i> <?= $this->l11n->getText(0, 'Delete'); ?></a>
     </ul>
 </section>
 
 <div class="box w-100">
     <table class="table">
-        <caption><?= $this->l11n->lang['Messages']['Messages']; ?></caption>
+        <caption><?= $this->l11n->getText('Messages', 'Messages'); ?></caption>
         <thead>
         <tr>
             <td><span class="check"><input type="checkbox"></span>
-            <td><?= $this->l11n->lang['Messages']['Tag']; ?>
-            <td class="wf-100"><?= $this->l11n->lang['Messages']['Subject']; ?>
-            <td><?= $this->l11n->lang['Messages']['From']; ?>
-            <td><?= $this->l11n->lang['Messages']['Date']; ?>
+            <td><?= $this->l11n->getText('Messages', 'Tag'); ?>
+            <td class="wf-100"><?= $this->l11n->getText('Messages', 'Subject'); ?>
+            <td><?= $this->l11n->getText('Messages', 'From'); ?>
+            <td><?= $this->l11n->getText('Messages', 'Date'); ?>
         <tfoot>
         <tr><td colspan="5"><?= \phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['usage']); ?> / <?= \phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['limit']); ?>
         <tbody>
@@ -51,7 +51,7 @@ echo $this->getData('nav')->render(); ?>
                 <?php endforeach; ?>
                 <?php if($count < 1) : ?>
         <tr>
-            <td colspan="5" class="empty"><?= $this->l11n->lang[0]['Empty']; ?>
+            <td colspan="5" class="empty"><?= $this->l11n->getText(0, 'Empty'); ?>
                 <?php endif; ?>
     </table>
 </div>
diff --git a/Theme/Backend/mail-spam-view.tpl.php b/Theme/Backend/mail-spam-view.tpl.php
index 69d5c2c..de81a19 100644
--- a/Theme/Backend/mail-spam-view.tpl.php
+++ b/Theme/Backend/mail-spam-view.tpl.php
@@ -22,21 +22,21 @@ echo $this->getData('nav')->render(); ?>
 
 <section class="box w-100">
     <ul class="btns floatLeft">
-        <li><a href="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/backend/messages/mail/create'); ?>"><i class="fa fa-pencil"></i> <?= $this->l11n->lang[0]['Create']; ?></a>
-        <li><a href=""><i class="fa fa-trash"></i> <?= $this->l11n->lang[0]['Delete']; ?></a>
+        <li><a href="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/backend/messages/mail/create'); ?>"><i class="fa fa-pencil"></i> <?= $this->l11n->getText(0, 'Create'); ?></a>
+        <li><a href=""><i class="fa fa-trash"></i> <?= $this->l11n->getText(0, 'Delete'); ?></a>
     </ul>
 </section>
 
 <div class="box w-100">
     <table class="table">
-        <caption><?= $this->l11n->lang['Messages']['Messages']; ?></caption>
+        <caption><?= $this->l11n->getText('Messages', 'Messages'); ?></caption>
         <thead>
         <tr>
             <td><span class="check"><input type="checkbox"></span>
-            <td><?= $this->l11n->lang['Messages']['Tag']; ?>
-            <td class="wf-100"><?= $this->l11n->lang['Messages']['Subject']; ?>
-            <td><?= $this->l11n->lang['Messages']['From']; ?>
-            <td><?= $this->l11n->lang['Messages']['Date']; ?>
+            <td><?= $this->l11n->getText('Messages', 'Tag'); ?>
+            <td class="wf-100"><?= $this->l11n->getText('Messages', 'Subject'); ?>
+            <td><?= $this->l11n->getText('Messages', 'From'); ?>
+            <td><?= $this->l11n->getText('Messages', 'Date'); ?>
         <tfoot>
         <tr><td colspan="5"><?= \phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['usage']); ?> / <?= \phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['limit']); ?>
         <tbody>
@@ -51,7 +51,7 @@ echo $this->getData('nav')->render(); ?>
                 <?php endforeach; ?>
                 <?php if($count < 1) : ?>
         <tr>
-            <td colspan="5" class="empty"><?= $this->l11n->lang[0]['Empty']; ?>
+            <td colspan="5" class="empty"><?= $this->l11n->getText(0, 'Empty'); ?>
                 <?php endif; ?>
     </table>
 </div>
diff --git a/Theme/Backend/mail-trash-view.tpl.php b/Theme/Backend/mail-trash-view.tpl.php
index 69d5c2c..de81a19 100644
--- a/Theme/Backend/mail-trash-view.tpl.php
+++ b/Theme/Backend/mail-trash-view.tpl.php
@@ -22,21 +22,21 @@ echo $this->getData('nav')->render(); ?>
 
 <section class="box w-100">
     <ul class="btns floatLeft">
-        <li><a href="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/backend/messages/mail/create'); ?>"><i class="fa fa-pencil"></i> <?= $this->l11n->lang[0]['Create']; ?></a>
-        <li><a href=""><i class="fa fa-trash"></i> <?= $this->l11n->lang[0]['Delete']; ?></a>
+        <li><a href="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/backend/messages/mail/create'); ?>"><i class="fa fa-pencil"></i> <?= $this->l11n->getText(0, 'Create'); ?></a>
+        <li><a href=""><i class="fa fa-trash"></i> <?= $this->l11n->getText(0, 'Delete'); ?></a>
     </ul>
 </section>
 
 <div class="box w-100">
     <table class="table">
-        <caption><?= $this->l11n->lang['Messages']['Messages']; ?></caption>
+        <caption><?= $this->l11n->getText('Messages', 'Messages'); ?></caption>
         <thead>
         <tr>
             <td><span class="check"><input type="checkbox"></span>
-            <td><?= $this->l11n->lang['Messages']['Tag']; ?>
-            <td class="wf-100"><?= $this->l11n->lang['Messages']['Subject']; ?>
-            <td><?= $this->l11n->lang['Messages']['From']; ?>
-            <td><?= $this->l11n->lang['Messages']['Date']; ?>
+            <td><?= $this->l11n->getText('Messages', 'Tag'); ?>
+            <td class="wf-100"><?= $this->l11n->getText('Messages', 'Subject'); ?>
+            <td><?= $this->l11n->getText('Messages', 'From'); ?>
+            <td><?= $this->l11n->getText('Messages', 'Date'); ?>
         <tfoot>
         <tr><td colspan="5"><?= \phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['usage']); ?> / <?= \phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['limit']); ?>
         <tbody>
@@ -51,7 +51,7 @@ echo $this->getData('nav')->render(); ?>
                 <?php endforeach; ?>
                 <?php if($count < 1) : ?>
         <tr>
-            <td colspan="5" class="empty"><?= $this->l11n->lang[0]['Empty']; ?>
+            <td colspan="5" class="empty"><?= $this->l11n->getText(0, 'Empty'); ?>
                 <?php endif; ?>
     </table>
 </div>
diff --git a/Theme/Backend/message-settings.tpl.php b/Theme/Backend/message-settings.tpl.php
index f562e04..da8bdf8 100644
--- a/Theme/Backend/message-settings.tpl.php
+++ b/Theme/Backend/message-settings.tpl.php
@@ -20,46 +20,46 @@ $boxes = $mail->getBoxes();
 echo $this->getData('nav')->render(); ?>
 
 <section class="box w-33">
-    <header><h1><?= $this->l11n->lang['Messages']['Mailboxes']; ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Messages', 'Mailboxes'); ?></h1></header>
     <div class="inner">
         <form>
             <table class="layout">
-                <tr><td><label for="iInbox"><?= $this->l11n->lang['Messages']['Inbox']; ?></label>
+                <tr><td><label for="iInbox"><?= $this->l11n->getText('Messages', 'Inbox'); ?></label>
                 <tr><td><select id="iInbox" name="inbox">
-                            <option value=""><?= $this->l11n->lang[0]['Select']; ?>
+                            <option value=""><?= $this->l11n->getText(0, 'Select'); ?>
                             <?php foreach($boxes as $box) : ?>
                             <option value="<?= $box; ?>"><?= $box; ?>
                             <?php endforeach; ?>
                         </select>
-                <tr><td><label for="iOutbox"><?= $this->l11n->lang['Messages']['Outbox']; ?></label>
+                <tr><td><label for="iOutbox"><?= $this->l11n->getText('Messages', 'Outbox'); ?></label>
                 <tr><td><select id="iOutbox" name="outbox">
-                            <option value=""><?= $this->l11n->lang[0]['Select']; ?>
+                            <option value=""><?= $this->l11n->getText(0, 'Select'); ?>
                             <?php foreach($boxes as $box) : ?>
                             <option value="<?= $box; ?>"><?= $box; ?>
                                 <?php endforeach; ?>
                         </select>
-                <tr><td><label for="iDraft"><?= $this->l11n->lang['Messages']['Draft']; ?></label>
+                <tr><td><label for="iDraft"><?= $this->l11n->getText('Messages', 'Draft'); ?></label>
                 <tr><td><select id="iDraft" name="draft">
-                            <option value=""><?= $this->l11n->lang[0]['Select']; ?>
+                            <option value=""><?= $this->l11n->getText(0, 'Select'); ?>
                             <?php foreach($boxes as $box) : ?>
                             <option value="<?= $box; ?>"><?= $box; ?>
                                 <?php endforeach; ?>
                         </select>
-                <tr><td><label for="iTrash"><?= $this->l11n->lang['Messages']['Trash']; ?></label>
+                <tr><td><label for="iTrash"><?= $this->l11n->getText('Messages', 'Trash'); ?></label>
                 <tr><td><select id="iTrash" name="trash">
-                            <option value=""><?= $this->l11n->lang[0]['Select']; ?>
+                            <option value=""><?= $this->l11n->getText(0, 'Select'); ?>
                             <?php foreach($boxes as $box) : ?>
                             <option value="<?= $box; ?>"><?= $box; ?>
                                 <?php endforeach; ?>
                         </select>
-                <tr><td><label for="iSpam"><?= $this->l11n->lang['Messages']['Spam']; ?></label>
+                <tr><td><label for="iSpam"><?= $this->l11n->getText('Messages', 'Spam'); ?></label>
                 <tr><td><select id="iSpam" name="spam">
-                            <option value=""><?= $this->l11n->lang[0]['Select']; ?>
+                            <option value=""><?= $this->l11n->getText(0, 'Select'); ?>
                             <?php foreach($boxes as $box) : ?>
                             <option value="<?= $box; ?>"><?= $box; ?>
                                 <?php endforeach; ?>
                         </select>
-                <tr><td><input type="submit" value="<?= $this->l11n->lang[0]['Save']; ?>">
+                <tr><td><input type="submit" value="<?= $this->l11n->getText(0, 'Save'); ?>">
             </table>
         </form>
     </div>
diff --git a/Theme/backend/mail-create.tpl.php b/Theme/backend/mail-create.tpl.php
index 76b0e83..d451e60 100644
--- a/Theme/backend/mail-create.tpl.php
+++ b/Theme/backend/mail-create.tpl.php
@@ -19,13 +19,13 @@ echo $this->getData('nav')->render(); ?>
     <div class="inner">
         <form>
             <table class="layout wf-100">
-                <tr><td style="width: 1%"><button class="simple"><i class="fa fa-book"></i></button><td><input type="text" placeholder="&#xf007; <?= $this->l11n->lang['Messages']['To']; ?>" name="to">
-                <tr><td style="width: 1%"><button class="simple"><i class="fa fa-book"></i></button><td><input type="text" placeholder="&#xf007; <?= $this->l11n->lang['Messages']['CC']; ?>" name="cc">
-                <tr><td style="width: 1%"><button class="simple"><i class="fa fa-book"></i></button><td><input type="text" placeholder="&#xf007; <?= $this->l11n->lang['Messages']['BCC']; ?>" name="bcc">
-                <tr><td><td><input type="text" placeholder="&#xf040; <?= $this->l11n->lang['Messages']['Subject']; ?>" name="subject">
+                <tr><td style="width: 1%"><button class="simple"><i class="fa fa-book"></i></button><td><input type="text" placeholder="&#xf007; <?= $this->l11n->getText('Messages', 'To'); ?>" name="to">
+                <tr><td style="width: 1%"><button class="simple"><i class="fa fa-book"></i></button><td><input type="text" placeholder="&#xf007; <?= $this->l11n->getText('Messages', 'CC'); ?>" name="cc">
+                <tr><td style="width: 1%"><button class="simple"><i class="fa fa-book"></i></button><td><input type="text" placeholder="&#xf007; <?= $this->l11n->getText('Messages', 'BCC'); ?>" name="bcc">
+                <tr><td><td><input type="text" placeholder="&#xf040; <?= $this->l11n->getText('Messages', 'Subject'); ?>" name="subject">
                 <tr><td><td><input type="file" name="files" multiple>
                 <tr><td><td><div class="textarea" contenteditable="true" style="height: 400px;"></div><textarea placeholder="&#xf040;" style="display: none" name="mail"></textarea>
-                <tr><td><td><input type="submit" value="<?= $this->l11n->lang[0]['Send']; ?>"> <input type="submit" value="<?= $this->l11n->lang[0]['Save']; ?>">
+                <tr><td><td><input type="submit" value="<?= $this->l11n->getText(0]['Send']; ?>"> <input type="submit" value="<?= $this->l11n->lang[0, 'Save'); ?>">
             </table>
         </form>
     </div>
diff --git a/Theme/backend/mail-out-view.tpl.php b/Theme/backend/mail-out-view.tpl.php
index 69d5c2c..de81a19 100644
--- a/Theme/backend/mail-out-view.tpl.php
+++ b/Theme/backend/mail-out-view.tpl.php
@@ -22,21 +22,21 @@ echo $this->getData('nav')->render(); ?>
 
 <section class="box w-100">
     <ul class="btns floatLeft">
-        <li><a href="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/backend/messages/mail/create'); ?>"><i class="fa fa-pencil"></i> <?= $this->l11n->lang[0]['Create']; ?></a>
-        <li><a href=""><i class="fa fa-trash"></i> <?= $this->l11n->lang[0]['Delete']; ?></a>
+        <li><a href="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/backend/messages/mail/create'); ?>"><i class="fa fa-pencil"></i> <?= $this->l11n->getText(0, 'Create'); ?></a>
+        <li><a href=""><i class="fa fa-trash"></i> <?= $this->l11n->getText(0, 'Delete'); ?></a>
     </ul>
 </section>
 
 <div class="box w-100">
     <table class="table">
-        <caption><?= $this->l11n->lang['Messages']['Messages']; ?></caption>
+        <caption><?= $this->l11n->getText('Messages', 'Messages'); ?></caption>
         <thead>
         <tr>
             <td><span class="check"><input type="checkbox"></span>
-            <td><?= $this->l11n->lang['Messages']['Tag']; ?>
-            <td class="wf-100"><?= $this->l11n->lang['Messages']['Subject']; ?>
-            <td><?= $this->l11n->lang['Messages']['From']; ?>
-            <td><?= $this->l11n->lang['Messages']['Date']; ?>
+            <td><?= $this->l11n->getText('Messages', 'Tag'); ?>
+            <td class="wf-100"><?= $this->l11n->getText('Messages', 'Subject'); ?>
+            <td><?= $this->l11n->getText('Messages', 'From'); ?>
+            <td><?= $this->l11n->getText('Messages', 'Date'); ?>
         <tfoot>
         <tr><td colspan="5"><?= \phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['usage']); ?> / <?= \phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['limit']); ?>
         <tbody>
@@ -51,7 +51,7 @@ echo $this->getData('nav')->render(); ?>
                 <?php endforeach; ?>
                 <?php if($count < 1) : ?>
         <tr>
-            <td colspan="5" class="empty"><?= $this->l11n->lang[0]['Empty']; ?>
+            <td colspan="5" class="empty"><?= $this->l11n->getText(0, 'Empty'); ?>
                 <?php endif; ?>
     </table>
 </div>
diff --git a/Theme/backend/mail-spam-view.tpl.php b/Theme/backend/mail-spam-view.tpl.php
index 69d5c2c..de81a19 100644
--- a/Theme/backend/mail-spam-view.tpl.php
+++ b/Theme/backend/mail-spam-view.tpl.php
@@ -22,21 +22,21 @@ echo $this->getData('nav')->render(); ?>
 
 <section class="box w-100">
     <ul class="btns floatLeft">
-        <li><a href="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/backend/messages/mail/create'); ?>"><i class="fa fa-pencil"></i> <?= $this->l11n->lang[0]['Create']; ?></a>
-        <li><a href=""><i class="fa fa-trash"></i> <?= $this->l11n->lang[0]['Delete']; ?></a>
+        <li><a href="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/backend/messages/mail/create'); ?>"><i class="fa fa-pencil"></i> <?= $this->l11n->getText(0, 'Create'); ?></a>
+        <li><a href=""><i class="fa fa-trash"></i> <?= $this->l11n->getText(0, 'Delete'); ?></a>
     </ul>
 </section>
 
 <div class="box w-100">
     <table class="table">
-        <caption><?= $this->l11n->lang['Messages']['Messages']; ?></caption>
+        <caption><?= $this->l11n->getText('Messages', 'Messages'); ?></caption>
         <thead>
         <tr>
             <td><span class="check"><input type="checkbox"></span>
-            <td><?= $this->l11n->lang['Messages']['Tag']; ?>
-            <td class="wf-100"><?= $this->l11n->lang['Messages']['Subject']; ?>
-            <td><?= $this->l11n->lang['Messages']['From']; ?>
-            <td><?= $this->l11n->lang['Messages']['Date']; ?>
+            <td><?= $this->l11n->getText('Messages', 'Tag'); ?>
+            <td class="wf-100"><?= $this->l11n->getText('Messages', 'Subject'); ?>
+            <td><?= $this->l11n->getText('Messages', 'From'); ?>
+            <td><?= $this->l11n->getText('Messages', 'Date'); ?>
         <tfoot>
         <tr><td colspan="5"><?= \phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['usage']); ?> / <?= \phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['limit']); ?>
         <tbody>
@@ -51,7 +51,7 @@ echo $this->getData('nav')->render(); ?>
                 <?php endforeach; ?>
                 <?php if($count < 1) : ?>
         <tr>
-            <td colspan="5" class="empty"><?= $this->l11n->lang[0]['Empty']; ?>
+            <td colspan="5" class="empty"><?= $this->l11n->getText(0, 'Empty'); ?>
                 <?php endif; ?>
     </table>
 </div>