diff --git a/dashboard/src/components/app/Email.vue b/dashboard/src/components/app/Email.vue
index a6cc6e7f6..b4326e0cd 100644
--- a/dashboard/src/components/app/Email.vue
+++ b/dashboard/src/components/app/Email.vue
@@ -132,7 +132,7 @@ onMounted(async () => {
 
         <Radiobutton v-if="sendmailOptional" v-model="enableMailbox" :value="1" :label="$t('app.email.from.enable')"/>
 
-        <div style="margin-bottom: 18px;" :style="{ 'padding-left': sendmailOptional ? '20px' : '0' }">
+        <div style="margin-bottom: 18px;" :style="{ 'padding-left': sendmailOptional ? '25px' : '0' }">
           <div v-html="$t('app.email.from.enableDescription', { domain: app.domain, domainConfigLink: ('/#/email/' + app.domain) })"></div>
           <br/>
 
@@ -156,33 +156,36 @@ onMounted(async () => {
         </div>
 
         <Radiobutton v-if="sendmailOptional" v-model="enableMailbox" :value="0" :label="$t('app.email.from.disable')"/>
-        <p v-if="sendmailOptional" style="padding-left: 20px;">{{ $t('app.email.from.disableDescription') }}</p>
+        <div v-if="sendmailOptional" style="padding-left: 25px;">{{ $t('app.email.from.disableDescription') }}</div>
       </FormGroup>
 
+      <br/>
       <Button @click="onSendmailSubmit()" :loading="sendmailBusy" :disabled="sendmailBusy || (app.error && app.error.details.installationState !== ISTATES.PENDING_SERVICES_CHANGE) || app.taskId">{{ $t('app.email.from.saveAction') }}</Button>
     </div>
 
-    <hr v-if="hasSendmail && hasRecvmail"/>
+    <hr style="margin-top: 20px" v-if="hasSendmail && hasRecvmail"/>
 
     <div v-if="hasRecvmail">
       <FormGroup>
         <label>{{ $t('app.email.inbox.title') }} <sup><a href="https://docs.cloudron.io/apps/#inbox" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
 
         <Radiobutton v-model="recvmailEnable" :value="1" :label="$t('app.email.inbox.enable')"/>
-        <div style="margin-bottom: 18px; padding-left: 20px">
-          <p v-html="$t('app.email.inbox.enableDescription', { domain: app.domain, domainConfigLink: ('/#/email/' + app.domain) })"></p>
+        <div style="margin-bottom: 18px; padding-left: 25px">
+          <div v-html="$t('app.email.inbox.enableDescription', { domain: app.domain, domainConfigLink: ('/#/email/' + app.domain) })"></div>
 
-          <FormGroup>
-            <div class="has-error" v-if="recvmailError">{{ recvmailError }}</div>
+          <div style="margin-top: 15px">
             <SingleSelect v-model="recvmailMailbox" :disabled="!recvmailEnable" :options="mailboxes" option-key="id"/>
-          </FormGroup>
+            <div class="has-error" v-if="recvmailError">{{ recvmailError }}</div>
+          </div>
         </div>
 
         <Radiobutton v-model="recvmailEnable" :value="0" :label="$t('app.email.inbox.disable')"/>
-        <p style="padding-left: 20px;">{{ $t('app.email.inbox.disableDescription') }}</p>
+        <div style="padding-left: 25px;">{{ $t('app.email.inbox.disableDescription') }}</div>
       </FormGroup>
-
-      <Button @click="onRecvmailSubmit()" :disabled="recvmailBusy || (app.error && app.error.details.installationState !== ISTATES.PENDING_SERVICES_CHANGE) || app.taskId" :loading="recvmailBusy">{{ $t('app.email.from.saveAction') }}</Button>
     </div>
+
+    <br/>
+    <Button @click="onRecvmailSubmit()" :disabled="recvmailBusy || (app.error && app.error.details.installationState !== ISTATES.PENDING_SERVICES_CHANGE) || app.taskId" :loading="recvmailBusy">{{ $t('app.email.from.saveAction') }}</Button>
+
   </div>
 </template>