diff --git a/src/views/emails.html b/src/views/emails.html
index 9b15be94a..410e7ba5c 100644
--- a/src/views/emails.html
+++ b/src/views/emails.html
@@ -3,12 +3,17 @@
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <h4 class="modal-title">Change Email Server Domain</h4>
+        <h4 class="modal-title">Change Email Server Location</h4>
       </div>
       <div class="modal-body">
+        <div>Cloudron will make the necessary DNS changes across all the domains and restart the mail server.
+          Mail clients have to be re-configured to use this new location as the IMAP and SMTP server.
+        </div>
+        <br>
+
         <form name="mailLocationForm" role="form" novalidate ng-submit="mailLocation.submit()" autocomplete="off">
           <div class="form-group" ng-class="{ 'has-error': (mailLocationForm.subdomain.$dirty && mailLocationForm.subdomain.$invalid) || (!mailLocationForm.subdomain.$dirty && mailLocation.error)}">
-            <label class="control-label">Domain</label>
+            <label class="control-label">Location</label>
 
             <div class="has-error" ng-show="mailLocation.error">{{ mailLocation.error.message }}</div>
 
@@ -93,7 +98,7 @@
             <textarea ng-model="spamConfig.blacklist" placeholder="Line separated email address patterns" name="blacklist" class="form-control" ng-class="{ 'has-error': !spamConfigChangeForm.blacklist.$dirty && spamConfig.error.blacklist }" rows="4"></textarea>
           </div>
           <div class="form-group">
-            <label class="control-label">Custom Spamassassin Config <sup><a ng-href="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/WritingRules" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
+            <label class="control-label">Custom Spamassassin Rules <sup><a ng-href="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/WritingRules" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
             <div class="has-error" ng-show="spamConfig.error.config">{{ spamConfig.error.config }}</div>
             <textarea ng-model="spamConfig.config" placeholder="Custom Spamassassin Rules" class="form-control"  name="config" ng-class="{ 'has-error': !spamConfigChangeForm.config.$dirty && spamConfig.error.config }" rows="4"></textarea>
           </div>
@@ -222,26 +227,18 @@
       <div class="col-xs-6 text-right">
         <span>{{ maxEmailSize.currentSize | prettyDiskSize }} <a href="" ng-click="maxEmailSize.show()"><i class="fa fa-edit text-small"></i></a></span>
       </div>
+      <div class="col-xs-6">
+        <span class="text-muted">Blocked IPs/Domains</span>
+      </div>
+      <div class="col-xs-6 text-right">
+        <span>5</span>
+      </div>
       <div class="col-xs-6">
         <span class="text-muted">Spam filtering</span>
       </div>
       <div class="col-xs-6 text-right">
         <span>{{ spamConfig.acl.blacklist.length }} address(es) blacklisted {{ spamConfig.customConfig ? ' + Custom Config' : '' }} <a href="" ng-click="spamConfig.show()"><i class="fa fa-edit text-small"></i></a></span>
       </div>
-      <div class="col-xs-6">
-        <span class="text-muted">Blocked origins</span>
-      </div>
-      <div class="col-xs-6 text-right">
-        <span>0</span>
-      </div>
-    </div>
-
-    <br/>
-
-    <div class="row">
-      <div class="col-md-12 text-right">
-        <button class="btn btn-outline btn-primary pull-right" ng-click="spamConfig.show()">Change Block/Allowlists</button>
-      </div>
     </div>
   </div>