diff --git a/src/js/client.js b/src/js/client.js
index 65eb6f5c6..706604e00 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -2398,6 +2398,25 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         });
     };
 
+    Client.prototype.getDnsblConfig = function (callback) {
+        var config = {};
+
+        get('/api/v1/mailserver/dnsbl_config', config, function (error, data, status) {
+            if (error) return callback(error);
+            if (status !== 200) return callback(new ClientError(status, data));
+            callback(null, data);
+        });
+    };
+
+    Client.prototype.setDnsblConfig = function (zones, callback) {
+        post('/api/v1/mailserver/dnsbl_config', { zones: zones }, null, function (error, data, status) {
+            if (error) return callback(error);
+            if (status !== 200) return callback(new ClientError(status, data));
+
+            callback(null);
+        });
+    };
+
     Client.prototype.getSolrConfig = function (callback) {
         var config = {};
 
diff --git a/src/translation/en.json b/src/translation/en.json
index 4299008de..e86dbda66 100644
--- a/src/translation/en.json
+++ b/src/translation/en.json
@@ -568,7 +568,9 @@
             "solrEnabled": "Enabled",
             "solrDisabled": "Disabled",
             "solrRunning": "Running",
-            "solrNotRunning": "Not Running"
+            "solrNotRunning": "Not Running",
+            "acl": "Mail ACL",
+            "aclOverview": "{{ dnsblZonesCount }} DNSBL zone(s)"
         },
         "eventlog": {
             "title": "Email Event Log",
@@ -631,7 +633,13 @@
             "notEnoughMemory": "Please allocate at least 3GB to the mail service to enable solr."
         },
         "typeFilterHeader": "All Events",
-        "eventlogActionTooltip": "Email Event Log"
+        "eventlogActionTooltip": "Email Event Log",
+        "aclDialog": {
+            "dnsblZones": "DNSBL Zones",
+            "dnsblZonesInfo": "Connecting IP address is looked up in these IP blocklists",
+            "dnsblZonesPlaceholder": "Line separated zone names",
+            "title": "Change Email ACL"
+        }
     },
     "network": {
         "title": "Network",
diff --git a/src/views/emails.html b/src/views/emails.html
index 85e7418a5..eb73b9938 100644
--- a/src/views/emails.html
+++ b/src/views/emails.html
@@ -99,6 +99,32 @@
   </div>
 </div>
 
+<!-- Modal change acl -->
+<div class="modal fade" id="aclChangeModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h4 class="modal-title">{{ 'emails.aclDialog.title' | tr }}</h4>
+      </div>
+      <div class="modal-body">
+        <form name="aclChangeForm" role="form" novalidate ng-submit="acl.submit()" autocomplete="off">
+          <div class="form-group">
+            <label class="control-label">{{ 'emails.aclDialog.dnsblZones' | tr }} <sup><a ng-href="https://docs.cloudron.io/email/#dnsbl" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
+            <p class="small">{{ 'emails.aclDialog.dnsblZonesInfo' | tr }}</p>
+            <div class="has-error" ng-show="acl.error.dnsblZones">{{ acl.error.dnsblZones }}</div>
+            <textarea ng-model="acl.dnsblZones" placeholder="{{ 'emails.aclDialog.dnsblZonesPlaceholder' | tr }}" name="dnsblZones" class="form-control" ng-class="{ 'has-error': !aclChangeForm.dnsblZones.$dirty && acl.error.dnsblZones }" rows="4"></textarea>
+          </div>
+          <input class="ng-hide" type="submit"/>
+        </form>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.cancel' | tr }}</button>
+        <button type="button" class="btn btn-success" ng-click="acl.submit()"><i class="fa fa-circle-notch fa-spin" ng-show="acl.busy"></i> {{ 'main.dialog.save' | tr }}</button>
+      </div>
+    </div>
+  </div>
+</div>
+
 <!-- Modal change spam config -->
 <div class="modal fade" id="spamConfigChangeModal" tabindex="-1" role="dialog">
   <div class="modal-dialog">
@@ -244,6 +270,12 @@
       <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">{{ 'emails.settings.acl' | tr }}</span>
+      </div>
+      <div class="col-xs-6 text-right">
+        <span>{{ 'emails.settings.aclOverview' | tr:{ dnsblZonesCount: acl.dnsblZonesCount } }} <a href="" ng-click="acl.show()"><i class="fa fa-edit text-small"></i></a></span>
+      </div>
       <div class="col-xs-6">
         <span class="text-muted">{{ 'emails.settings.spamFilter' | tr }}</span>
       </div>
diff --git a/src/views/emails.js b/src/views/emails.js
index d7ce487c6..6467ec631 100644
--- a/src/views/emails.js
+++ b/src/views/emails.js
@@ -273,6 +273,55 @@ angular.module('Application').controller('EmailsController', ['$scope', '$locati
         }
     },
 
+    $scope.acl = {
+        busy: false,
+        error: {},
+
+        dnsblZones: '',
+        dnsblZonesCount: 0,
+
+        refresh: function () {
+            Client.getDnsblConfig(function (error, result) {
+                if (error) return console.error('Failed to get email acl', error);
+
+                $scope.acl.dnsblZones = result.zones.join('\n');
+                $scope.acl.dnsblZonesCount = result.zones.length;
+            });
+        },
+
+        show: function() {
+            $scope.acl.busy = false;
+            $scope.acl.error = {};
+
+            $scope.aclChangeForm.$setUntouched();
+            $scope.aclChangeForm.$setPristine();
+
+            $('#aclChangeModal').modal('show');
+        },
+
+        submit: function () {
+            $scope.acl.busy = true;
+            $scope.acl.error = {};
+
+            var zones = $scope.acl.dnsblZones.split('\n').filter(function (l) { return l !== ''; });
+
+            Client.setDnsblConfig(zones, function (error) {
+                if (error) {
+                    $scope.acl.busy = false;
+                    $scope.acl.error.dnsblZones = error.message;
+                    $scope.aclChangeForm.dnsblZones.$setPristine();
+                    return;
+                }
+
+                $scope.acl.busy = false;
+
+                $scope.acl.refresh();
+
+                $('#aclChangeModal').modal('hide');
+            });
+        }
+    },
+
     $scope.testEmail = {
         busy: false,
         error: {},
@@ -364,6 +413,7 @@ angular.module('Application').controller('EmailsController', ['$scope', '$locati
             $scope.maxEmailSize.refresh();
             $scope.spamConfig.refresh();
             $scope.solrConfig.refresh();
+            $scope.acl.refresh();
 
             refreshDomainStatuses();
         });