diff --git a/src/views/app.html b/src/views/app.html
index 845eb6d49..5bd5e8250 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -866,33 +866,35 @@
               </label>
             </div>
 
-            <p ng-bind-html="'app.email.from.enableDescription' | tr:{ domain: app.domain, domainConfigLink: ('/#/email/' + app.domain) }"></p>
+            <div style="padding-left: 20px;">
+              <p ng-bind-html="'app.email.from.enableDescription' | tr:{ domain: app.domain, domainConfigLink: ('/#/email/' + app.domain) }"></p>
 
-            <form role="form" name="emailForm" ng-submit="email.submit()" autocomplete="off">
-              <fieldset ng-disabled="!email.enableMailbox">
-                <div class="form-group" ng-class="{ 'has-error': emailForm.$dirty && email.error.mailboxName }">
-                  <div ng-show="email.error.mailboxName">{{ email.error.mailboxName }}</div>
+              <form role="form" name="emailForm" ng-submit="email.submit()" autocomplete="off">
+                <fieldset ng-disabled="!email.enableMailbox">
+                  <div class="form-group" ng-class="{ 'has-error': emailForm.$dirty && email.error.mailboxName }">
+                    <div ng-show="email.error.mailboxName">{{ email.error.mailboxName }}</div>
 
-                  <div class="input-group form-inline" ng-class="{ 'has-error': !emailForm.mailboxName.$dirty && email.error.mailboxName }">
-                    <input type="text" class="form-control" name="mailboxName" placeholder="{{ 'app.email.from.mailboxPlaceholder' | tr }}" ng-model="email.mailboxName">
+                    <div class="input-group form-inline" ng-class="{ 'has-error': !emailForm.mailboxName.$dirty && email.error.mailboxName }">
+                      <input type="text" class="form-control" name="mailboxName" placeholder="{{ 'app.email.from.mailboxPlaceholder' | tr }}" ng-model="email.mailboxName">
 
-                    <div class="input-group-btn">
-                      <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-                        <span>{{ '@' + email.mailboxDomain.domain }}</span>
-                        <span class="caret"></span>
-                      </button>
-                      <ul class="dropdown-menu dropdown-menu-right" role="menu">
-                        <li ng-repeat="domain in domains">
-                          <a href="" ng-click="email.mailboxDomain = domain">{{ domain.domain }}</a>
-                        </li>
-                      </ul>
+                      <div class="input-group-btn">
+                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+                          <span>{{ '@' + email.mailboxDomain.domain }}</span>
+                          <span class="caret"></span>
+                        </button>
+                        <ul class="dropdown-menu dropdown-menu-right" role="menu">
+                          <li ng-repeat="domain in domains">
+                            <a href="" ng-click="email.mailboxDomain = domain">{{ domain.domain }}</a>
+                          </li>
+                        </ul>
+                      </div>
                     </div>
+                    <br/>
                   </div>
-                  <br/>
-                </div>
-              </fieldset>
-              <input class="ng-hide" type="submit" ng-disabled="(email.currentMailboxDomainName === email.mailboxDomain.domain && email.currentMailboxName === email.mailboxName) || email.busy || app.error || app.taskId"/>
-            </form>
+                </fieldset>
+                <input class="ng-hide" type="submit" ng-disabled="(email.currentMailboxDomainName === email.mailboxDomain.domain && email.currentMailboxName === email.mailboxName) || email.busy || app.error || app.taskId"/>
+              </form>
+            </div>
 
             <div class="radio" ng-show="app.manifest.addons.sendmail.optional">
               <label>
@@ -900,7 +902,9 @@
               </label>
             </div>
 
-            <p ng-show="app.manifest.addons.sendmail.optional">{{ 'app.email.from.disableDescription' | tr }}</p>
+            <div style="padding-left: 20px;">
+              <p ng-show="app.manifest.addons.sendmail.optional">{{ 'app.email.from.disableDescription' | tr }}</p>
+            </div>
           </div>
         </div>
         <div class="row">