diff --git a/webadmin/src/views/email.html b/webadmin/src/views/email.html
index e9cb18ef6..51471c33f 100644
--- a/webadmin/src/views/email.html
+++ b/webadmin/src/views/email.html
@@ -96,7 +96,7 @@
     <br/>
     <div class="row">
       <div class="col-md-12" ng-show="selectedDomain.provider !== 'caas'">
-        <button class="pull-left" ng-class="selectedDomain.mailConfig.enabled ? 'btn btn-danger' : 'btn btn-primary'" ng-click="email.toggle()" ng-enabled="selectedDomain.mailConfig">{{ selectedDomain.mailConfig.enabled ? "Disable Email" : "Enable Email" }}</button>
+        <button ng-class="selectedDomain.mailConfig.enabled ? 'btn btn-danger' : 'btn btn-primary'" ng-click="email.toggle()" ng-enabled="selectedDomain.mailConfig">{{ selectedDomain.mailConfig.enabled ? "Disable Email" : "Enable Email" }}</button>
       </div>
       <div class="col-md-12" ng-show="selectedDomain.provider === 'caas'">
         <span class="text-danger text-bold">This feature requires the Cloudron to be on <a ng-href="{{ config.webServerOrigin + '/documentation/managed-hosting/#using-a-custom-domain' }}" target="_blank">custom domain</a>.</span>
@@ -220,7 +220,7 @@
               <p class="text-muted">
                 <i ng-hide="refreshBusy" ng-class="expectedDnsRecords[record.value].status ? 'fa fa-check-circle text-success' : 'fa fa-exclamation-triangle text-danger'"></i> &nbsp;
                 <a href="" data-toggle="collapse" data-parent="#accordion" data-target="#collapse_dns_{{ record.value }}">{{ record.name }} record</a>
-                <button class="btn btn-xs btn-default" ng-click="email.refresh()" ng-disabled="refreshBusy" ng-show="!expectedDnsRecords[record.value].status"><i class="fa fa-refresh" ng-class="{ 'fa-pulse': refreshBusy }"></i></button>
+                <button class="btn btn-xs btn-default" ng-click="refreshStatus()" ng-disabled="refreshBusy" ng-show="!expectedDnsRecords[record.value].status"><i class="fa fa-refresh" ng-class="{ 'fa-pulse': refreshBusy }"></i></button>
               </p>
               <div id="collapse_dns_{{ record.value }}" class="panel-collapse collapse">
                 <div class="panel-body">
@@ -254,7 +254,7 @@
               <a href="" data-toggle="collapse" data-parent="#accordion" data-target="#collapse_outbound_smtp">
                 Outbound SMTP
               </a>
-              <button class="btn btn-xs btn-default" ng-click="email.refresh()" ng-disabled="refreshBusy" ng-show="!selectedDomain.mailStatus.relay.status"><i class="fa fa-refresh" ng-class="{ 'fa-pulse': refreshBusy }"></i></button>
+              <button class="btn btn-xs btn-default" ng-click="refreshStatus()" ng-disabled="refreshBusy" ng-show="!selectedDomain.mailStatus.relay.status"><i class="fa fa-refresh" ng-class="{ 'fa-pulse': refreshBusy }"></i></button>
             </p>
             <div id="collapse_outbound_smtp" class="panel-collapse collapse">
               <div class="panel-body">
@@ -267,16 +267,16 @@
         <div class="row" ng-show="selectedDomain.mailConfig.relay.provider === 'cloudron-smtp'">
           <div class="col-xs-12">
             <p class="text-muted">
-              <i ng-hide="refreshBusy" ng-class="rbl.status ? 'fa fa-check-circle text-success' : 'fa fa-exclamation-triangle text-danger'"></i> &nbsp;
+              <i ng-hide="refreshBusy" ng-class="selectedDomain.mailStatus.rbl.status ? 'fa fa-check-circle text-success' : 'fa fa-exclamation-triangle text-danger'"></i> &nbsp;
               <a href="" data-toggle="collapse" data-parent="#accordion" data-target="#collapse_rbl">
                   IP Address Blacklist Check
               </a>
-              <button class="btn btn-xs btn-default" ng-click="email.refresh()" ng-disabled="refreshBusy" ng-show="!rbl.status"><i class="fa fa-refresh" ng-class="{ 'fa-pulse': refreshBusy }"></i></button>
+              <button class="btn btn-xs btn-default" ng-click="refreshStatus()" ng-disabled="refreshBusy" ng-show="!selectedDomain.mailStatus.rbl.status"><i class="fa fa-refresh" ng-class="{ 'fa-pulse': refreshBusy }"></i></button>
             </p>
             <div id="collapse_rbl" class="panel-collapse collapse">
               <div class="panel-body">
-                  <div>This server's IP {{ rbl.ip }} is <b ng-hide="rbl.servers.length">not</b> blacklisted.</div>
-                  <div ng-repeat="server in rbl.servers">
+                  <div>This server's IP {{ selectedDomain.mailStatus.rbl.ip }} is <b ng-hide="selectedDomain.mailStatus.rbl.servers.length">not</b> blacklisted.</div>
+                  <div ng-repeat="server in selectedDomain.mailStatus.rbl.servers">
                     <a ng-href="{{server.site}}" target="_blank">{{ server.name }}</a>
                   </div>
               </div>
diff --git a/webadmin/src/views/email.js b/webadmin/src/views/email.js
index 65510ba10..85ac312c5 100644
--- a/webadmin/src/views/email.js
+++ b/webadmin/src/views/email.js
@@ -285,6 +285,24 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
         });
     };
 
+    $scope.refreshStatus = function () {
+        $scope.refreshBusy = true;
+
+        Client.getMailStatusForDomain($scope.selectedDomain.domain, function (error, mailStatus) {
+            if (error) {
+                $scope.refreshBusy = false;
+                return console.error(error);
+            }
+
+            // overwrite the selected domain status to be available for the UI
+            $scope.selectedDomain.mailStatus = mailStatus;
+
+            showExpectedDnsRecords();
+
+            $scope.refreshBusy = false;
+        });
+    };
+
     function getCatchallAddresses() {
         Client.getCatchallAddresses(function (error, result) {
             if (error) return console.error('Unable to get catchall address listing.', error);