diff --git a/src/views/email.html b/src/views/email.html
index be0fd0ad5..a6f94b4a8 100644
--- a/src/views/email.html
+++ b/src/views/email.html
@@ -16,6 +16,11 @@
         <div ng-show="selectedDomain.provider === 'noop' || selectedDomain.provider === 'manual'">
           No DNS provider is setup. The DNS records listed in the Status tab have to be setup manually.<br/>
         </div>
+        <div class="text-danger" ng-show="adminDomain.provider === 'cloudflare'">
+          Please verify that Cloudflare proxying for <code>{{ config.adminFqdn }}</code> is disabled and set to <code>DNS only</code>.
+          This is required because Cloudflare does not proxy email.<br/><br/>
+        </div>
+
         <div ng-hide="selectedDomain.provider === 'noop' || selectedDomain.provider === 'manual'">
           <p>
             <label class="control-label">
diff --git a/src/views/email.js b/src/views/email.js
index b3ce520af..feaae51ee 100644
--- a/src/views/email.js
+++ b/src/views/email.js
@@ -15,6 +15,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
     $scope.domains = [];
     $scope.users = [];
     $scope.selectedDomain = null;
+    $scope.adminDomain = null;
 
     $scope.expectedDnsRecords = {
         mx: { },
@@ -696,6 +697,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
 
                 $scope.domains = domains;
                 $scope.selectedDomain = domains.find(function (d) { return d.domain === domain; });
+                $scope.adminDomain = domains.find(function (d) { return d.domain === $scope.config.adminDomain; });
 
                 if (!$scope.selectedDomain) {
                     $location.path('/email/' + domains[0].domain, false);