diff --git a/Theme/Backend/dashboard.tpl.php b/Theme/Backend/dashboard.tpl.php
index 4a877f7..c34d6c4 100755
--- a/Theme/Backend/dashboard.tpl.php
+++ b/Theme/Backend/dashboard.tpl.php
@@ -31,22 +31,22 @@ echo $this->getData('nav')->render(); ?>
 <div class="row">
     <div class="col-xs-12">
         <a tabindex="0" class="button" href="<?= UriFactory::build('{/prefix}messages/mail/create'); ?>"><i class="fa fa-pencil"></i> <?= $this->getHtml('Create', '0', '0'); ?></a>
-        <a tabindex="0" class="button" href=""><i class="fa fa-trash"></i> <?= $this->getHtml('Delete') ?></a>
+        <a tabindex="0" class="button" href=""><i class="fa fa-trash"></i> <?= $this->getHtml('Delete'); ?></a>
     </div>
 </div>
 
 <div class="row">
     <div class="col-xs-12 col-md-8 col-lg-10">
         <div class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Messages') ?><i class="fa fa-download floatRight download btn"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Messages'); ?><i class="fa fa-download floatRight download btn"></i></div>
             <table id="profileList" class="default">
             <thead>
             <tr>
                 <td><span class="check"><input type="checkbox"></span>
-                <td><?= $this->getHtml('Tag') ?>
-                <td class="wf-100"><?= $this->getHtml('Subject') ?>
-                <td><?= $this->getHtml('From') ?>
-                <td><?= $this->getHtml('Date') ?>
+                <td><?= $this->getHtml('Tag'); ?>
+                <td class="wf-100"><?= $this->getHtml('Subject'); ?>
+                <td><?= $this->getHtml('From'); ?>
+                <td><?= $this->getHtml('Date'); ?>
             <tbody>
                 <?php $count = 0; foreach ($unseen as $key => $value) : ++$count;
                 $url = UriFactory::build('{/prefix}messages/mail/single?{?}&id=' . $value->uid); ?>
diff --git a/Theme/Backend/mail-create.tpl.php b/Theme/Backend/mail-create.tpl.php
index da48353..92fa910 100755
--- a/Theme/Backend/mail-create.tpl.php
+++ b/Theme/Backend/mail-create.tpl.php
@@ -18,13 +18,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->getHtml('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->getHtml('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->getHtml('BCC') ?>" name="bcc">
-                <tr><td><td><input type="text" placeholder="&#xf040; <?= $this->getHtml('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->getHtml('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->getHtml('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->getHtml('BCC'); ?>" name="bcc">
+                <tr><td><td><input type="text" placeholder="&#xf040; <?= $this->getHtml('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->getHtml('Send', '0', '0') ?>"> <input type="submit" value="<?= $this->getHtml('Save', '0', '0') ?>">
+                <tr><td><td><input type="submit" value="<?= $this->getHtml('Send', '0', '0'); ?>"> <input type="submit" value="<?= $this->getHtml('Save', '0', '0'); ?>">
             </table>
         </form>
     </div>
diff --git a/Theme/Backend/mail-out-view.tpl.php b/Theme/Backend/mail-out-view.tpl.php
index 76ee68b..802b854 100755
--- a/Theme/Backend/mail-out-view.tpl.php
+++ b/Theme/Backend/mail-out-view.tpl.php
@@ -22,20 +22,20 @@ echo $this->getData('nav')->render(); ?>
 <section class="box w-100">
     <ul class="btns floatLeft">
         <li><a href="<?= \phpOMS\Uri\UriFactory::build('{/prefix}messages/mail/create'); ?>"><i class="fa fa-pencil"></i> <?= $this->getHtml('Create', '0', '0'); ?></a>
-        <li><a href=""><i class="fa fa-trash"></i> <?= $this->getHtml('Delete') ?></a>
+        <li><a href=""><i class="fa fa-trash"></i> <?= $this->getHtml('Delete'); ?></a>
     </ul>
 </section>
 
 <div class="box w-100">
     <table class="default">
-        <caption><?= $this->getHtml('Messages') ?><i class="fa fa-download floatRight download btn"></i></caption>
+        <caption><?= $this->getHtml('Messages'); ?><i class="fa fa-download floatRight download btn"></i></caption>
         <thead>
         <tr>
             <td><span class="check"><input type="checkbox"></span>
-            <td><?= $this->getHtml('Tag') ?>
-            <td class="wf-100"><?= $this->getHtml('Subject') ?>
-            <td><?= $this->getHtml('From') ?>
-            <td><?= $this->getHtml('Date') ?>
+            <td><?= $this->getHtml('Tag'); ?>
+            <td class="wf-100"><?= $this->getHtml('Subject'); ?>
+            <td><?= $this->getHtml('From'); ?>
+            <td><?= $this->getHtml('Date'); ?>
         <tfoot>
         <tr><td colspan="5"><?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['usage'])); ?> / <?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['limit'])); ?>
         <tbody>
diff --git a/Theme/Backend/mail-spam-view.tpl.php b/Theme/Backend/mail-spam-view.tpl.php
index 76ee68b..802b854 100755
--- a/Theme/Backend/mail-spam-view.tpl.php
+++ b/Theme/Backend/mail-spam-view.tpl.php
@@ -22,20 +22,20 @@ echo $this->getData('nav')->render(); ?>
 <section class="box w-100">
     <ul class="btns floatLeft">
         <li><a href="<?= \phpOMS\Uri\UriFactory::build('{/prefix}messages/mail/create'); ?>"><i class="fa fa-pencil"></i> <?= $this->getHtml('Create', '0', '0'); ?></a>
-        <li><a href=""><i class="fa fa-trash"></i> <?= $this->getHtml('Delete') ?></a>
+        <li><a href=""><i class="fa fa-trash"></i> <?= $this->getHtml('Delete'); ?></a>
     </ul>
 </section>
 
 <div class="box w-100">
     <table class="default">
-        <caption><?= $this->getHtml('Messages') ?><i class="fa fa-download floatRight download btn"></i></caption>
+        <caption><?= $this->getHtml('Messages'); ?><i class="fa fa-download floatRight download btn"></i></caption>
         <thead>
         <tr>
             <td><span class="check"><input type="checkbox"></span>
-            <td><?= $this->getHtml('Tag') ?>
-            <td class="wf-100"><?= $this->getHtml('Subject') ?>
-            <td><?= $this->getHtml('From') ?>
-            <td><?= $this->getHtml('Date') ?>
+            <td><?= $this->getHtml('Tag'); ?>
+            <td class="wf-100"><?= $this->getHtml('Subject'); ?>
+            <td><?= $this->getHtml('From'); ?>
+            <td><?= $this->getHtml('Date'); ?>
         <tfoot>
         <tr><td colspan="5"><?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['usage'])); ?> / <?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['limit'])); ?>
         <tbody>
diff --git a/Theme/Backend/mail-trash-view.tpl.php b/Theme/Backend/mail-trash-view.tpl.php
index 76ee68b..802b854 100755
--- a/Theme/Backend/mail-trash-view.tpl.php
+++ b/Theme/Backend/mail-trash-view.tpl.php
@@ -22,20 +22,20 @@ echo $this->getData('nav')->render(); ?>
 <section class="box w-100">
     <ul class="btns floatLeft">
         <li><a href="<?= \phpOMS\Uri\UriFactory::build('{/prefix}messages/mail/create'); ?>"><i class="fa fa-pencil"></i> <?= $this->getHtml('Create', '0', '0'); ?></a>
-        <li><a href=""><i class="fa fa-trash"></i> <?= $this->getHtml('Delete') ?></a>
+        <li><a href=""><i class="fa fa-trash"></i> <?= $this->getHtml('Delete'); ?></a>
     </ul>
 </section>
 
 <div class="box w-100">
     <table class="default">
-        <caption><?= $this->getHtml('Messages') ?><i class="fa fa-download floatRight download btn"></i></caption>
+        <caption><?= $this->getHtml('Messages'); ?><i class="fa fa-download floatRight download btn"></i></caption>
         <thead>
         <tr>
             <td><span class="check"><input type="checkbox"></span>
-            <td><?= $this->getHtml('Tag') ?>
-            <td class="wf-100"><?= $this->getHtml('Subject') ?>
-            <td><?= $this->getHtml('From') ?>
-            <td><?= $this->getHtml('Date') ?>
+            <td><?= $this->getHtml('Tag'); ?>
+            <td class="wf-100"><?= $this->getHtml('Subject'); ?>
+            <td><?= $this->getHtml('From'); ?>
+            <td><?= $this->getHtml('Date'); ?>
         <tfoot>
         <tr><td colspan="5"><?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['usage'])); ?> / <?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['limit'])); ?>
         <tbody>
diff --git a/Theme/Backend/message-settings.tpl.php b/Theme/Backend/message-settings.tpl.php
index 74844dd..5989bb3 100755
--- a/Theme/Backend/message-settings.tpl.php
+++ b/Theme/Backend/message-settings.tpl.php
@@ -19,46 +19,46 @@ $boxes = $mail->getBoxes();
 echo $this->getData('nav')->render(); ?>
 
 <section class="box w-33">
-    <header><h1><?= $this->getHtml('Mailboxes') ?></h1></header>
+    <header><h1><?= $this->getHtml('Mailboxes'); ?></h1></header>
     <div class="inner">
         <form>
             <table class="layout">
-                <tr><td><label for="iInbox"><?= $this->getHtml('Inbox') ?></label>
+                <tr><td><label for="iInbox"><?= $this->getHtml('Inbox'); ?></label>
                 <tr><td><select id="iInbox" name="inbox">
-                            <option value=""><?= $this->getHtml('Select') ?>
+                            <option value=""><?= $this->getHtml('Select'); ?>
                             <?php foreach ($boxes as $box) : ?>
                             <option value="<?= $this->printHtml($box); ?>"><?= $this->printHtml($box); ?>
                             <?php endforeach; ?>
                         </select>
-                <tr><td><label for="iOutbox"><?= $this->getHtml('Outbox') ?></label>
+                <tr><td><label for="iOutbox"><?= $this->getHtml('Outbox'); ?></label>
                 <tr><td><select id="iOutbox" name="outbox">
-                            <option value=""><?= $this->getHtml('Select') ?>
+                            <option value=""><?= $this->getHtml('Select'); ?>
                             <?php foreach ($boxes as $box) : ?>
                             <option value="<?= $this->printHtml($box); ?>"><?= $this->printHtml($box); ?>
                                 <?php endforeach; ?>
                         </select>
-                <tr><td><label for="iDraft"><?= $this->getHtml('Draft') ?></label>
+                <tr><td><label for="iDraft"><?= $this->getHtml('Draft'); ?></label>
                 <tr><td><select id="iDraft" name="draft">
-                            <option value=""><?= $this->getHtml('Select') ?>
+                            <option value=""><?= $this->getHtml('Select'); ?>
                             <?php foreach ($boxes as $box) : ?>
                             <option value="<?= $this->printHtml($box); ?>"><?= $this->printHtml($box); ?>
                                 <?php endforeach; ?>
                         </select>
-                <tr><td><label for="iTrash"><?= $this->getHtml('Trash') ?></label>
+                <tr><td><label for="iTrash"><?= $this->getHtml('Trash'); ?></label>
                 <tr><td><select id="iTrash" name="trash">
-                            <option value=""><?= $this->getHtml('Select') ?>
+                            <option value=""><?= $this->getHtml('Select'); ?>
                             <?php foreach ($boxes as $box) : ?>
                             <option value="<?= $this->printHtml($box); ?>"><?= $this->printHtml($box); ?>
                                 <?php endforeach; ?>
                         </select>
-                <tr><td><label for="iSpam"><?= $this->getHtml('Spam') ?></label>
+                <tr><td><label for="iSpam"><?= $this->getHtml('Spam'); ?></label>
                 <tr><td><select id="iSpam" name="spam">
-                            <option value=""><?= $this->getHtml('Select') ?>
+                            <option value=""><?= $this->getHtml('Select'); ?>
                             <?php foreach ($boxes as $box) : ?>
                             <option value="<?= $this->printHtml($box); ?>"><?= $this->printHtml($box); ?>
                                 <?php endforeach; ?>
                         </select>
-                <tr><td><input type="submit" value="<?= $this->getHtml('Save') ?>">
+                <tr><td><input type="submit" value="<?= $this->getHtml('Save'); ?>">
             </table>
         </form>
     </div>