diff --git a/dashboard/src/js/client.js b/dashboard/src/js/client.js
index 09fa21cf3..f7c0d019f 100644
--- a/dashboard/src/js/client.js
+++ b/dashboard/src/js/client.js
@@ -3068,7 +3068,7 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
     };
 
     Client.prototype.setSpamAcl = function (acl, callback) {
-        post('/api/v1/mailserver/spam_acl', { whitelist: acl.whitelist, blacklist: acl.blacklist }, null, function (error, data, status) {
+        post('/api/v1/mailserver/spam_acl', { allowlist: acl.allowlist, blocklist: acl.blocklist }, null, function (error, data, status) {
             if (error) return callback(error);
             if (status !== 200) return callback(new ClientError(status, data));
 
diff --git a/dashboard/src/views/emails.html b/dashboard/src/views/emails.html
index c3c642735..d90c5dd6c 100644
--- a/dashboard/src/views/emails.html
+++ b/dashboard/src/views/emails.html
@@ -101,8 +101,8 @@
           <div class="form-group">
             <label class="control-label">{{ 'emails.spamFilterDialog.blacklisteAddresses' | tr }}</label>
             <p class="small">{{ 'emails.spamFilterDialog.blacklisteAddressesInfo' | tr }}</p>
-            <div class="has-error" ng-show="spamConfig.error.blacklist">{{ spamConfig.error.blacklist }}</div>
-            <textarea ng-model="spamConfig.blacklist" placeholder="{{ 'emails.spamFilterDialog.blacklisteAddressesPlaceholder' | tr }}" name="blacklist" class="form-control" ng-class="{ 'has-error': !spamConfigChangeForm.blacklist.$dirty && spamConfig.error.blacklist }" rows="4"></textarea>
+            <div class="has-error" ng-show="spamConfig.error.blocklist">{{ spamConfig.error.blocklist }}</div>
+            <textarea ng-model="spamConfig.blocklist" placeholder="{{ 'emails.spamFilterDialog.blacklisteAddressesPlaceholder' | tr }}" name="blocklist" class="form-control" ng-class="{ 'has-error': !spamConfigChangeForm.blocklist.$dirty && spamConfig.error.blocklist }" rows="4"></textarea>
           </div>
           <div class="form-group">
             <label class="control-label">{{ 'emails.spamFilterDialog.customRules' | tr }} <sup><a ng-href="https://docs.cloudron.io/email/#custom-spam-filtering-rules" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
@@ -341,7 +341,7 @@
         <span class="text-muted">{{ 'emails.settings.spamFilter' | tr }}</span>
       </div>
       <div class="col-xs-6 text-right">
-        <span>{{ 'emails.settings.spamFilterOverview' | tr:{ blacklistCount: spamConfig.acl.blacklist.length } }} <a href="" ng-click="spamConfig.show()"><i class="fa fa-edit text-small"></i></a></span>
+        <span>{{ 'emails.settings.spamFilterOverview' | tr:{ blacklistCount: spamConfig.acl.blocklist.length } }} <a href="" ng-click="spamConfig.show()"><i class="fa fa-edit text-small"></i></a></span>
       </div>
       <div class="col-xs-6">
         <span class="text-muted">{{ 'emails.settings.solrFts' | tr }}</span>
diff --git a/dashboard/src/views/emails.js b/dashboard/src/views/emails.js
index c36855ea4..9b5c56fb0 100644
--- a/dashboard/src/views/emails.js
+++ b/dashboard/src/views/emails.js
@@ -250,11 +250,11 @@ angular.module('Application').controller('EmailsController', ['$scope', '$locati
     $scope.spamConfig = {
         busy: false,
         error: {},
-        acl: { whitelist: [], blacklist: [] },
+        acl: { allowlist: [], blocklist: [] },
         customConfig: '',
 
         config: '',
-        blacklist: '', // currently, we don't support whitelist because it requires user to understand a bit more of what he is doing
+        blocklist: '', // currently, we don't support allowlist because it requires user to understand a bit more of what he is doing
 
         refresh: function () {
             Client.getSpamCustomConfig(function (error, config) {
@@ -274,7 +274,7 @@ angular.module('Application').controller('EmailsController', ['$scope', '$locati
             $scope.spamConfig.busy = false;
             $scope.spamConfig.error = {};
 
-            $scope.spamConfig.blacklist = $scope.spamConfig.acl.blacklist.join('\n');
+            $scope.spamConfig.blocklist = $scope.spamConfig.acl.blocklist.join('\n');
             $scope.spamConfig.config = $scope.spamConfig.customConfig;
 
             $scope.spamConfigChangeForm.$setUntouched();
@@ -287,13 +287,13 @@ angular.module('Application').controller('EmailsController', ['$scope', '$locati
             $scope.spamConfig.busy = true;
             $scope.spamConfig.error = {};
 
-            var blacklist = $scope.spamConfig.blacklist.split('\n').filter(function (l) { return l !== ''; });
+            var blocklist = $scope.spamConfig.blocklist.split('\n').filter(function (l) { return l !== ''; });
 
-            Client.setSpamAcl({ blacklist: blacklist, whitelist: [] }, function (error) {
+            Client.setSpamAcl({ blocklist: blocklist, allowlist: [] }, function (error) {
                 if (error) {
                     $scope.spamConfig.busy = false;
-                    $scope.spamConfig.error.blacklist = error.message;
-                    $scope.spamConfigChangeForm.blacklist.$setPristine();
+                    $scope.spamConfig.error.blocklist = error.message;
+                    $scope.spamConfigChangeForm.blocklist.$setPristine();
                     return;
                 }
 
diff --git a/src/infra_version.js b/src/infra_version.js
index 2b6135d14..ab372b5a8 100644
--- a/src/infra_version.js
+++ b/src/infra_version.js
@@ -13,7 +13,7 @@ exports = module.exports = {
     'images': {
         'base': 'registry.docker.com/cloudron/base:4.2.0@sha256:46da2fffb36353ef714f97ae8e962bd2c212ca091108d768ba473078319a47f4',
         'graphite': 'registry.docker.com/cloudron/graphite:3.4.3@sha256:75df420ece34b31a7ce8d45b932246b7f524c123e1854f5e8f115a9e94e33f20',
-        'mail': 'registry.docker.com/cloudron/mail:3.12.1@sha256:f539bea6c7360d3c0aa604323847172359593f109b304bb2d2c5152ca56be05c',
+        'mail': 'registry.docker.com/cloudron/mail:3.13.0@sha256:6a335dd0601ea75ea8f5d41adfdc058414448e143ab0f393922a487950437fae',
         'mongodb': 'registry.docker.com/cloudron/mongodb:6.0.0@sha256:1108319805acfb66115aa96a8fdbf2cded28d46da0e04d171a87ec734b453d1e',
         'mysql': 'registry.docker.com/cloudron/mysql:3.4.2@sha256:379749708186a89f4ae09d6b23b58bc6d99a2005bac32e812b4b1dafa47071e4',
         'postgresql': 'registry.docker.com/cloudron/postgresql:5.2.1@sha256:5ef3aea8873da25ea5e682e458b11c99fc8df25ae90c7695a6f40bda8d120057',