diff --git a/src/views/email.html b/src/views/email.html
index 752ee2eca..5f14cc83c 100644
--- a/src/views/email.html
+++ b/src/views/email.html
@@ -298,7 +298,7 @@
   <h1><i class="fa fa-circle-notch fa-spin"></i></h1>
 </div>
 
-<div class="content content-large" ng-show="ready">
+<div class="content" ng-show="ready">
   <a href="/#/email" class="back-to-view-link"><i class="fas fa-arrow-left"></i> {{ 'email.backAction' | tr }}</a>
 
   <br/>
@@ -314,9 +314,12 @@
       <div class="card card-large" style="margin-bottom: 15px;">
         <h4>{{ 'email.incoming.title' | tr }}</h4>
 
+        <p ng-bind-html="'email.incoming.description' | tr:{ emailDocsLink: 'https://docs.cloudron.io/email/', rainloopLink: '/#/appstore/net.rainloop.cloudronapp', sogoLink: '/#/appstore/nu.sogo.cloudronapp2', roundcubeLink: '/#/appstore/net.roundcube.cloudronapp' } "></p>
+
+        <p><a href="" data-toggle="collapse" data-parent="#accordion" data-target="#mail_settings">{{ 'email.config.connectionDetails' | tr }}</a></p>
+
         <div class="row">
-          <div class="col-md-10" ng-bind-html="'email.incoming.description' | tr:{ emailDocsLink: 'https://docs.cloudron.io/email/', rainloopLink: '/#/appstore/net.rainloop.cloudronapp', sogoLink: '/#/appstore/nu.sogo.cloudronapp2', roundcubeLink: '/#/appstore/net.roundcube.cloudronapp' } "></div>
-          <div class="col-md-2">
+          <div class="col-md-12">
             <button class="pull-right" ng-class="domain.mailConfig.enabled ? 'btn btn-danger' : 'btn btn-primary'" ng-click="incomingEmail.toggleEmailEnabled()" ng-disabled="incomingEmail.busy">
               <i class="fa fa-circle-notch fa-spin" ng-show="incomingEmail.busy"></i>
               {{ domain.mailConfig.enabled ? ('email.incoming.disableAction' | tr) : ('email.incoming.enableAction' | tr) }}
@@ -324,12 +327,6 @@
           </div>
         </div>
 
-        <br/>
-        <div class="row">
-          <div class="col-md-12">
-            <a href="" data-toggle="collapse" data-parent="#accordion" data-target="#mail_settings">{{ 'email.config.connectionDetails' | tr }}</a>
-          </div>
-        </div>
         <div class="row">
           <div class="col-md-12">
             <div id="mail_settings" class="panel-collapse collapse">
@@ -560,7 +557,7 @@
 
         <div class="row">
           <div class="col-md-12">
-            <button class="btn btn-primary" ng-click="mailRelay.submit()" ng-disabled="(usesExternalServer(mailRelay.preset.provider) && (!mailRelayForm.$dirty || mailRelayForm.$invalid)) || mailRelay.busy"><i class="fa fa-circle-notch fa-spin" ng-show="mailRelay.busy"></i> {{ 'email.outbound.mailRelay.saveAction' | tr }}</button>
+            <button class="btn btn-primary pull-right" ng-click="mailRelay.submit()" ng-disabled="(usesExternalServer(mailRelay.preset.provider) && (!mailRelayForm.$dirty || mailRelayForm.$invalid)) || mailRelay.busy"><i class="fa fa-circle-notch fa-spin" ng-show="mailRelay.busy"></i> {{ 'email.outbound.mailRelay.saveAction' | tr }}</button>
 
             <span class="has-error text-center" ng-show="mailRelay.error">{{ mailRelay.error }}</span>
             <span class="text-success text-center text-bold" ng-show="mailRelay.success">{{ 'email.outbound.mailRelay.saveSuccess' | tr }}</span>
@@ -579,10 +576,9 @@
     <uib-tab index="'settings'" select="setView('settings')" heading="{{ 'email.settings.tabTitle' | tr }}">
       <div class="card card-large" style="margin-bottom: 15px;">
         <h4>{{ 'email.masquerading.title' | tr }}</h4>
-
+        <p ng-bind-html=" 'email.masquerading.description' | tr "></p>
         <div class="row">
-          <div class="col-md-9" ng-bind-html=" 'email.masquerading.description' | tr "></div>
-          <div class="col-md-3">
+          <div class="col-md-12 text-right">
             <button class="pull-right" ng-class="domain.mailConfig.mailFromValidation ? 'btn btn-danger' : 'btn btn-primary'" ng-disabled="mailFromValidation.busy" ng-click="mailFromValidation.submit()">
               <i class="fa fa-circle-notch fa-spin" ng-show="mailFromValidation.busy"></i> {{ domain.mailConfig.mailFromValidation ? ('email.masquerading.enableAction' | tr) : ('email.masquerading.disableAction' | tr) }}
             </button>