diff --git a/src/views/email.html b/src/views/email.html
index 9ef3d087f..b13bc6aca 100644
--- a/src/views/email.html
+++ b/src/views/email.html
@@ -527,7 +527,8 @@
       </uib-tab>
 
       <uib-tab index="3" heading="Status">
-        <div class="card card-large" style="margin-bottom: 15px;" ng-show="selectedDomain.mailConfig.relay.provider === 'cloudron-smtp'">
+        <!-- nothing to show if incoming mail is disabled and using a relay -->
+        <div class="card card-large" style="margin-bottom: 15px;" ng-hide="!selectedDomain.mailConfig.enabled && selectedDomain.mailConfig.relay.provider !== 'cloudron-smtp'">
           <div class="row">
             <div class="col-md-12">
               <h4>DNS Status
@@ -542,7 +543,7 @@
               <br/><br/>
 
               <div ng-repeat="record in expectedDnsRecordsTypes">
-                <div class="row" ng-if="expectedDnsRecords[record.value] && (selectedDomain.mailConfig.enabled || (record.name !== 'DMARC' && record.name !== 'MX'))">
+                <div class="row" ng-if="expectedDnsRecords[record.value].expected">
                   <div class="col-xs-12">
                     <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;