diff --git a/Theme/Backend/mail-trash-view.tpl.php b/Theme/Backend/mail-trash-view.tpl.php
index 5a03865..69d5c2c 100644
--- a/Theme/Backend/mail-trash-view.tpl.php
+++ b/Theme/Backend/mail-trash-view.tpl.php
@@ -27,7 +27,7 @@ echo $this->getData('nav')->render(); ?>
     </ul>
 </section>
 
-<section class="box w-100">
+<div class="box w-100">
     <table class="table">
         <caption><?= $this->l11n->lang['Messages']['Messages']; ?></caption>
         <thead>
@@ -54,4 +54,4 @@ echo $this->getData('nav')->render(); ?>
             <td colspan="5" class="empty"><?= $this->l11n->lang[0]['Empty']; ?>
                 <?php endif; ?>
     </table>
-</section>
+</div>
diff --git a/Theme/backend/dashboard.tpl.php b/Theme/backend/dashboard.tpl.php
index 5c1cbef..a9ad7c1 100644
--- a/Theme/backend/dashboard.tpl.php
+++ b/Theme/backend/dashboard.tpl.php
@@ -28,7 +28,7 @@ echo $this->getData('nav')->render(); ?>
     </ul>
 </section>
 
-<section class="box w-100">
+<div class="box w-100">
     <table class="table">
         <caption><?= $this->l11n->lang['Messages']['Messages']; ?></caption>
         <thead>
@@ -65,4 +65,4 @@ echo $this->getData('nav')->render(); ?>
             <td colspan="5" class="empty"><?= $this->l11n->lang[0]['Empty']; ?>
         <?php endif; ?>
     </table>
-</section>
+</div>
diff --git a/Theme/backend/mail-out-view.tpl.php b/Theme/backend/mail-out-view.tpl.php
index 5a03865..69d5c2c 100644
--- a/Theme/backend/mail-out-view.tpl.php
+++ b/Theme/backend/mail-out-view.tpl.php
@@ -27,7 +27,7 @@ echo $this->getData('nav')->render(); ?>
     </ul>
 </section>
 
-<section class="box w-100">
+<div class="box w-100">
     <table class="table">
         <caption><?= $this->l11n->lang['Messages']['Messages']; ?></caption>
         <thead>
@@ -54,4 +54,4 @@ echo $this->getData('nav')->render(); ?>
             <td colspan="5" class="empty"><?= $this->l11n->lang[0]['Empty']; ?>
                 <?php endif; ?>
     </table>
-</section>
+</div>
diff --git a/Theme/backend/mail-spam-view.tpl.php b/Theme/backend/mail-spam-view.tpl.php
index 5a03865..69d5c2c 100644
--- a/Theme/backend/mail-spam-view.tpl.php
+++ b/Theme/backend/mail-spam-view.tpl.php
@@ -27,7 +27,7 @@ echo $this->getData('nav')->render(); ?>
     </ul>
 </section>
 
-<section class="box w-100">
+<div class="box w-100">
     <table class="table">
         <caption><?= $this->l11n->lang['Messages']['Messages']; ?></caption>
         <thead>
@@ -54,4 +54,4 @@ echo $this->getData('nav')->render(); ?>
             <td colspan="5" class="empty"><?= $this->l11n->lang[0]['Empty']; ?>
                 <?php endif; ?>
     </table>
-</section>
+</div>
diff --git a/Theme/backend/message-settings.tpl.php b/Theme/backend/message-settings.tpl.php
index 881a330..f562e04 100644
--- a/Theme/backend/message-settings.tpl.php
+++ b/Theme/backend/message-settings.tpl.php
@@ -20,7 +20,7 @@ $boxes = $mail->getBoxes();
 echo $this->getData('nav')->render(); ?>
 
 <section class="box w-33">
-    <h1><?= $this->l11n->lang['Messages']['Mailboxes']; ?></h1>
+    <header><h1><?= $this->l11n->lang['Messages']['Mailboxes']; ?></h1></header>
     <div class="inner">
         <form>
             <table class="layout">