diff --git a/CHANGES b/CHANGES
index b4aa715a0..12fa8116e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2690,4 +2690,5 @@
 * api: return json when route not found
 * oidc: loginRedirectUri can be empty string
 * New base image 4.2.0. sha256: b5117f36a07d1fd7136e8086694056adbb9a53ef6f0c822ab9c5c84f2ef4fe4f
+* mail: add option to enable/disable Virtual All mailbox
 
diff --git a/dashboard/src/js/client.js b/dashboard/src/js/client.js
index f43216186..21ca90962 100644
--- a/dashboard/src/js/client.js
+++ b/dashboard/src/js/client.js
@@ -2914,6 +2914,23 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         });
     };
 
+    Client.prototype.getVirtualAllMail = function (callback) {
+        get('/api/v1/mailserver/virtual_all_mail', {}, function (error, data, status) {
+            if (error) return callback(error);
+            if (status !== 200) return callback(new ClientError(status, data));
+            callback(null, data.enabled);
+        });
+    };
+
+    Client.prototype.setVirtualAllMail = function (enable, callback) {
+        post('/api/v1/mailserver/virtual_all_mail', { enable: enable }, null, function (error, data, status) {
+            if (error) return callback(error);
+            if (status !== 200) return callback(new ClientError(status, data));
+
+            callback(null);
+        });
+    };
+
     Client.prototype.getDnsblConfig = function (callback) {
         var config = {};
 
diff --git a/dashboard/src/translation/en.json b/dashboard/src/translation/en.json
index 2b451c098..489f9dfd9 100644
--- a/dashboard/src/translation/en.json
+++ b/dashboard/src/translation/en.json
@@ -677,7 +677,8 @@
             "solrRunning": "Running",
             "solrNotRunning": "Not Running",
             "acl": "Mail ACL",
-            "aclOverview": "{{ dnsblZonesCount }} DNSBL zone(s)"
+            "aclOverview": "{{ dnsblZonesCount }} DNSBL zone(s)",
+            "virtualAllMail": "\"All Mail\" Folder"
         },
         "eventlog": {
             "title": "Email Event Log",
@@ -768,6 +769,10 @@
         },
         "action": {
             "queue": "Queue"
+        },
+        "changeVirtualAllMailDialog": {
+            "title": "\"All Mail\" Folder",
+            "description": "The \"All Mail\" folder is a single folder that contains all the mails in your Inbox. The folder can be useful in mail clients that do not support recursive folder search."
         }
     },
     "network": {
diff --git a/dashboard/src/translation/nl.json b/dashboard/src/translation/nl.json
index 484b2132e..3d32adaf5 100644
--- a/dashboard/src/translation/nl.json
+++ b/dashboard/src/translation/nl.json
@@ -634,7 +634,8 @@
                 "description": "Backup behouden, ongeacht het bewaarbeleid"
             },
             "title": "Bewerk Backup",
-            "label": "Label"
+            "label": "Label",
+            "remotePath": "Extern pad"
         }
     },
     "branding": {
diff --git a/dashboard/src/views/emails.html b/dashboard/src/views/emails.html
index f6b0580da..18e2bf28d 100644
--- a/dashboard/src/views/emails.html
+++ b/dashboard/src/views/emails.html
@@ -24,6 +24,24 @@
   </div>
 </div>
 
+<!-- Modal change virtual all mail -->
+<div class="modal fade" id="virtualAllMailChangeModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h4 class="modal-title">{{ 'emails.changeVirtualAllMailDialog.title' | tr }}</h4>
+      </div>
+      <div class="modal-body">
+        <div ng-bind-html=" 'emails.changeVirtualAllMailDialog.description' | tr "></div>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.cancel' | tr }}</button>
+        <button class="btn btn-primary" ng-click="virtualAllMail.submit(!virtualAllMail.enabled)"><i class="fa fa-circle-notch fa-spin" ng-show="virtualAllMail.busy"></i> {{ virtualAllMail.enabled ? ('main.disableAction' | tr) : ('main.enableAction' | tr) }} </button>
+      </div>
+    </div>
+  </div>
+</div>
+
 <!-- Modal solr config -->
 <div class="modal fade" id="solrConfigModal" tabindex="-1" role="dialog">
   <div class="modal-dialog">
@@ -297,6 +315,12 @@
       <div class="col-xs-6 text-right">
         <span>{{ maxEmailSize.currentSize | prettyDecimalSize }} <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.virtualAllMail' | tr }}</span>
+      </div>
+      <div class="col-xs-6 text-right">
+        <span>{{ virtualAllMail.enabled ? 'main.statusEnabled' : 'main.statusDisabled' | tr }} <a href="" ng-click="virtualAllMail.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>
diff --git a/dashboard/src/views/emails.js b/dashboard/src/views/emails.js
index 393485528..f2dc72103 100644
--- a/dashboard/src/views/emails.js
+++ b/dashboard/src/views/emails.js
@@ -133,6 +133,41 @@ angular.module('Application').controller('EmailsController', ['$scope', '$locati
         }
     };
 
+    $scope.virtualAllMail = {
+        busy: false,
+        error: null,
+        enabled: false,
+
+        refresh: function () {
+            Client.getVirtualAllMail(function (error, enabled) {
+                if (error) return console.error('Failed to get max email size', error);
+
+                $scope.virtualAllMail.enabled = enabled;
+            });
+        },
+
+        show: function() {
+            $scope.virtualAllMail.busy = false;
+            $scope.virtualAllMail.error = null;
+
+            $('#virtualAllMailChangeModal').modal('show');
+        },
+
+        submit: function (enable) {
+            $scope.virtualAllMail.busy = true;
+
+            Client.setVirtualAllMail(enable, function (error) {
+                $scope.virtualAllMail.busy = false;
+
+                if (error) return console.error(error);
+
+                $scope.virtualAllMail.enabled = enable;
+
+                $('#virtualAllMailChangeModal').modal('hide');
+            });
+        }
+    };
+
     $scope.mailboxSharing = {
         busy: false,
         error: null,
@@ -422,6 +457,7 @@ angular.module('Application').controller('EmailsController', ['$scope', '$locati
             if ($scope.user.isAtLeastOwner) {
                 $scope.mailLocation.refresh();
                 $scope.maxEmailSize.refresh();
+                $scope.virtualAllMail.refresh();
                 $scope.mailboxSharing.refresh();
                 $scope.spamConfig.refresh();
                 $scope.solrConfig.refresh();
diff --git a/src/infra_version.js b/src/infra_version.js
index 0c14a61da..05a2d0d54 100644
--- a/src/infra_version.js
+++ b/src/infra_version.js
@@ -17,7 +17,7 @@ exports = module.exports = {
         'postgresql': 'registry.docker.com/cloudron/postgresql:5.1.0@sha256:45157dd523438f07039e94064e39895a85926e62fa4c9f796b2bbed878e72fe3',
         'mongodb': 'registry.docker.com/cloudron/mongodb:5.1.0@sha256:4c500b8b7a1cbd93d382b54e496c939366d4d252872209a03be79e082b9b60f7',
         'redis': 'registry.docker.com/cloudron/redis:3.5.0@sha256:ecad7c4086974e31643f7eb199f8d0149b1c7640aec7ba63daa6ac7d4f56417a',
-        'mail': 'registry.docker.com/cloudron/mail:3.10.0@sha256:a308ef917301d2aa4f3207944aa295c18e043d547b6e9c7e3ede4ab2391e186d',
+        'mail': 'registry.docker.com/cloudron/mail:3.11.0@sha256:3667544046d5ad2d62eb44a018f011ca306dc00e3a5a3533057ae39d1c5a9695',
         'graphite': 'registry.docker.com/cloudron/graphite:3.4.0@sha256:ee8a1267d3ea4d42d2df38e78f9b3b99b917b22aeb706e47816151caeefe28bd',
         'sftp': 'registry.docker.com/cloudron/sftp:3.8.0@sha256:b536873b309cb1253299cfd2cd8efbd03c2ac7ad4e15147b8a928c34130488c4'
     }
diff --git a/src/server.js b/src/server.js
index ad7c66765..7248029de 100644
--- a/src/server.js
+++ b/src/server.js
@@ -339,6 +339,8 @@ async function initializeExpressSync() {
     router.post('/api/v1/mailserver/solr_config',             token, authorizeAdmin, routes.mailserver.proxy, routes.mailserver.restart);
     router.get ('/api/v1/mailserver/mailbox_sharing',         token, authorizeAdmin, routes.mailserver.proxy);
     router.post('/api/v1/mailserver/mailbox_sharing',         token, authorizeAdmin, routes.mailserver.proxy, routes.mailserver.restart);
+    router.get ('/api/v1/mailserver/virtual_all_mail',        token, authorizeAdmin, routes.mailserver.proxy);
+    router.post('/api/v1/mailserver/virtual_all_mail',        token, authorizeAdmin, routes.mailserver.proxy, routes.mailserver.restart);
     router.get ('/api/v1/mailserver/usage',                   token, authorizeMailManager, routes.mailserver.proxy);
 
     router.use ('/api/v1/mailserver/queue',                   token, authorizeAdmin, routes.mailserver.queueProxy);