diff --git a/dashboard/src/views/email.html b/dashboard/src/views/email.html
index 3c4eaa378..443e8bc1d 100644
--- a/dashboard/src/views/email.html
+++ b/dashboard/src/views/email.html
@@ -107,6 +107,66 @@
     </div>
   </div>
 
+  <div class="text-left" ng-show="selectedDomain.mailConfig.enabled">
+    <h3>Mailboxes</h3>
+  </div>
+
+  <div class="card" style="margin-bottom: 15px;" ng-show="selectedDomain.mailConfig.enabled">
+    <div class="row">
+      <div class="col-md-12">
+        Enable mailboxes for users on this domain. Each user will get an email address of <b>username@{{ selectedDomain.domain }}</b>
+
+        <br/><br/>
+
+        <table class="table table-hover">
+          <thead>
+            <tr>
+              <th>&nbsp;</th>
+              <th>User</th>
+              <th class="text-left">Aliases (Separate by comma)</th>
+              <th class="text-right">Action</th>
+            </tr>
+          </thead>
+          <tbody>
+              <tr ng-repeat="user in mailboxes.users">
+                  <td>
+                    <input type="checkbox" ng-model="user.mailboxEnabled" title="Mailbox Enabled">
+                  </td>
+                  <td class="text-left elide-table-cell">
+                    {{ user.username }}
+                  </td>
+                  <td>
+                    <tag-input ng-show="user.mailboxEnabled" placeholder="add alias" taglist="user.aliases" name="aliases"></tag-input>
+                  </td>
+                  <td class="text-right no-wrap">
+                      <button ng-show="user.mailboxEnabled !== user.orig.mailboxEnabled || user.aliases !== user.orig.aliases" class="btn btn-xs btn-primary" ng-disabled="user.busy" ng-click="mailboxes.submit(user)"><i class="fa fa-circle-o-notch fa-spin" ng-show="user.busy"></i> Save</button>
+                  </td>
+              </tr>
+          </tbody>
+        </table>
+      </div>
+    </div>
+  </div>
+
+  <div class="text-left" ng-show="selectedDomain.mailConfig.enabled">
+    <h3>Catch-all</h3>
+  </div>
+
+  <div class="card" style="margin-bottom: 15px;" ng-show="selectedDomain.mailConfig.enabled">
+    <div class="row">
+      <div class="col-md-12">
+        Emails sent to non existing addresses will be forwarded to the following accounts:
+      </div>
+    </div>
+    <br/>
+    <div class="row">
+      <div class="col-md-6">
+        <multiselect ng-model="catchall.addresses" options="address for address in catchall.availableAddresses" data-multiple="true"></multiselect>
+        <button class="btn btn-outline btn-primary" ng-disabled="catchall.busy" ng-click="catchall.submit()"><i class="fa fa-circle-o-notch fa-spin" ng-show="catchall.busy"></i> Save</button>
+      </div>
+    </div>
+  </div>
+
   <div class="text-left">
     <h3>Outbound Mail Relay</h3>
   </div>
@@ -186,66 +246,6 @@
     </div>
   </div>
 
-  <div class="text-left" ng-show="selectedDomain.mailConfig.enabled">
-    <h3>Mailboxes</h3>
-  </div>
-
-  <div class="card" style="margin-bottom: 15px;" ng-show="selectedDomain.mailConfig.enabled">
-    <div class="row">
-      <div class="col-md-12">
-        Enable mailboxes for users on this domain. Each user will get an email address of <b>username@{{ selectedDomain.domain }}</b>
-
-        <br/><br/>
-
-        <table class="table table-hover">
-          <thead>
-            <tr>
-              <th>&nbsp;</th>
-              <th>User</th>
-              <th class="text-left">Aliases (Separate by comma)</th>
-              <th class="text-right">Action</th>
-            </tr>
-          </thead>
-          <tbody>
-              <tr ng-repeat="user in mailboxes.users">
-                  <td>
-                    <input type="checkbox" ng-model="user.mailboxEnabled" title="Mailbox Enabled">
-                  </td>
-                  <td class="text-left elide-table-cell">
-                    {{ user.username }}
-                  </td>
-                  <td>
-                    <tag-input ng-show="user.mailboxEnabled" placeholder="add alias" taglist="user.aliases" name="aliases"></tag-input>
-                  </td>
-                  <td class="text-right no-wrap">
-                      <button ng-show="user.mailboxEnabled !== user.orig.mailboxEnabled || user.aliases !== user.orig.aliases" class="btn btn-xs btn-primary" ng-disabled="user.busy" ng-click="mailboxes.submit(user)"><i class="fa fa-circle-o-notch fa-spin" ng-show="user.busy"></i> Save</button>
-                  </td>
-              </tr>
-          </tbody>
-        </table>
-      </div>
-    </div>
-  </div>
-
-  <div class="text-left" ng-show="selectedDomain.mailConfig.enabled">
-    <h3>Catch-all</h3>
-  </div>
-
-  <div class="card" style="margin-bottom: 15px;" ng-show="selectedDomain.mailConfig.enabled">
-    <div class="row">
-      <div class="col-md-12">
-        Emails sent to non existing addresses will be forwarded to the following accounts:
-      </div>
-    </div>
-    <br/>
-    <div class="row">
-      <div class="col-md-6">
-        <multiselect ng-model="catchall.addresses" options="address for address in catchall.availableAddresses" data-multiple="true"></multiselect>
-        <button class="btn btn-outline btn-primary" ng-disabled="catchall.busy" ng-click="catchall.submit()"><i class="fa fa-circle-o-notch fa-spin" ng-show="catchall.busy"></i> Save</button>
-      </div>
-    </div>
-  </div>
-
   <div class="text-left" ng-show="selectedDomain.provider !== 'caas' && selectedDomain.mailConfig.relay.provider === 'cloudron-smtp'">
     <h3>DNS Records</h3>
   </div>