diff --git a/src/views/email.html b/src/views/email.html
index ebe035958..135975a95 100644
--- a/src/views/email.html
+++ b/src/views/email.html
@@ -4,7 +4,7 @@
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <h4 class="modal-title">Cloudron Email Server</h4>
+        <h4 class="modal-title">Enable Email for {{selectedDomain.domain}}?</h4>
       </div>
       <div class="modal-body">
         <div ng-show="selectedDomain.provider === 'noop' || selectedDomain.provider === 'manual'">
@@ -14,7 +14,7 @@
           Cloudron will setup Email related DNS records automatically for {{selectedDomain.domain}}. Status of DNS Records below
           may show an error while DNS is propagating (~5 minutes).
           <br/><br/>
-          If this domain is already configured to handle email with some other provider, it will overwrite those records.
+          If this domain is already configured to handle email with some other provider, it will overwrite those DNS records.
         </div>
         <br/>
         <div>Any installed webmail clients will be automatically re-configured to reflect this change.</div>
@@ -32,13 +32,13 @@
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <h4 class="modal-title">Cloudron Email Server</h4>
+        <h4 class="modal-title">Disable Email Server for {{selectedDomain.domain}}?</h4>
       </div>
       <div class="modal-body">
-        <div>This will disable the Cloudron Email Server for {{selectedDomain.domain}}.</div>
-        <br/>
         <div>Any installed webmail clients will be automatically re-configured to reflect this change.</div>
         <br/>
+        <div><b>Mailboxes and lists associated with this domain will not be deleted</b>.</div>
+        <br/>
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
@@ -299,15 +299,16 @@
           <br/>
         </div>
 
-        <div class="text-left" ng-show="selectedDomain.mailConfig.enabled">
+        <div class="text-left">
           <h3 style="margin-bottom: 15px;">Mailboxes
-            <button class="btn btn-primary btn-outline pull-right" ng-click="mailboxes.add.show()">
+            <button class="btn btn-primary btn-outline pull-right" ng-click="mailboxes.add.show()"  ng-disabled="!selectedDomain.mailConfig.enabled"
+                    tooltip-enable="!selectedDomain.mailConfig.enabled" uib-tooltip="Email is disabled for this domain">
               <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="card card-large" style="margin-bottom: 15px;">
           <div class="row">
             <div class="col-md-12">
               <table class="table table-hover">
@@ -341,15 +342,16 @@
           </div>
         </div>
 
-        <div class="text-left" ng-show="selectedDomain.mailConfig.enabled">
+        <div class="text-left">
           <h3 style="margin-bottom: 15px;">Mailing Lists
-            <button class="btn btn-primary btn-outline pull-right" ng-click="mailinglists.add.show()">
+            <button class="btn btn-primary btn-outline pull-right" ng-click="mailinglists.add.show()" ng-disabled="!selectedDomain.mailConfig.enabled"
+                    tooltip-enable="!selectedDomain.mailConfig.enabled" uib-tooltip="Email is disabled for this domain">
               <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="card card-large" style="margin-bottom: 15px;">
           <div class="row">
             <div class="col-md-12">
               A Mailing list forwards all emails to it's members.
@@ -384,11 +386,11 @@
           </div>
         </div>
 
-        <div class="text-left" ng-show="selectedDomain.mailConfig.enabled">
+        <div class="text-left">
           <h3>Catch-all</h3>
         </div>
 
-        <div class="card card-large" style="margin-bottom: 15px;" ng-show="selectedDomain.mailConfig.enabled">
+        <div class="card card-large" style="margin-bottom: 15px;">
           <div class="row">
             <div class="col-md-12">
               Emails sent to non existing addresses will be forwarded to the following mailboxes:
@@ -398,7 +400,10 @@
           <div class="row">
             <div class="col-md-6">
               <multiselect ng-model="catchall.mailboxes" options="mailbox.name for mailbox in mailboxes.mailboxes" data-compare-by="name" data-multiple="true"></multiselect>
-              <button class="btn btn-outline btn-primary" ng-disabled="catchall.busy" ng-click="catchall.submit()"><i class="fa fa-circle-notch fa-spin" ng-show="catchall.busy"></i> Save</button>
+              <button class="btn btn-outline btn-primary" ng-click="catchall.submit()" ng-disabled="catchall.busy || !selectedDomain.mailConfig.enabled"
+                      tooltip-enable="!selectedDomain.mailConfig.enabled" uib-tooltip="Email is disabled for this domain">
+                <i class="fa fa-circle-notch fa-spin" ng-show="catchall.busy"></i> Save
+              </button>
             </div>
           </div>
         </div>
diff --git a/src/views/email.js b/src/views/email.js
index 04fe75140..dcd5f50eb 100644
--- a/src/views/email.js
+++ b/src/views/email.js
@@ -57,7 +57,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
             Client.setCatchallAddresses($scope.selectedDomain.domain, addresses, function (error) {
                 if (error) console.error('Unable to add catchall address.', error);
 
-                $scope.catchall.busy = false;
+                $timeout(function () { $scope.catchall.busy = false; }, 2000); // otherwise, it's too fast
             });
         },