diff --git a/dashboard/src/views/email.html b/dashboard/src/views/email.html
index e956cc25b..9f9324b7f 100644
--- a/dashboard/src/views/email.html
+++ b/dashboard/src/views/email.html
@@ -273,16 +273,16 @@
   <br/>
 
   <div class="text-left" ng-show="selectedDomain.mailConfig.enabled">
-    <h3>Mailboxes</h3>
+    <h3>Mailboxes
+      <button class="btn btn-primary btn-outline pull-right" ng-click="mailboxes.add.show()">
+        <i class="fa fa-inbox"></i> New Mailbox
+      </button>
+    </h3>
   </div>
 
   <div class="card card-large" style="margin-bottom: 15px;" ng-show="selectedDomain.mailConfig.enabled">
     <div class="row">
       <div class="col-md-12">
-        Each mailboxes has an owner, who is able to access the mailbox.
-
-        <br/><br/>
-
         <table class="table table-hover">
           <thead>
             <tr>
@@ -310,9 +310,6 @@
             </tr>
           </tbody>
         </table>
-        <button class="btn btn-primary btn-outline pull-right" ng-click="mailboxes.add.show()">
-          <i class="fa fa-inbox"></i> New Mailbox
-        </button>
       </div>
     </div>
   </div>
@@ -320,13 +317,17 @@
   <br/>
 
   <div class="text-left" ng-show="selectedDomain.mailConfig.enabled">
-    <h3>Mailinglists</h3>
+    <h3>Mailing Lists
+      <button class="btn btn-primary btn-outline pull-right" ng-click="mailinglists.add.show()">
+        <i class="fa fa-list"></i> New Mailing list
+      </button>
+  </h3>
   </div>
 
   <div class="card card-large" style="margin-bottom: 15px;" ng-show="selectedDomain.mailConfig.enabled">
     <div class="row">
       <div class="col-md-12">
-        Mailinglists will forward all emails to the associated mailboxes.
+        A Mailing list forwards all emails to the associated mailboxes.
 
         <br/>
         <br/>
@@ -354,9 +355,6 @@
             </tr>
           </tbody>
         </table>
-        <button class="btn btn-primary btn-outline pull-right" ng-click="mailinglists.add.show()">
-          <i class="fa fa-list"></i> New Mailinglist
-        </button>
       </div>
     </div>
   </div>