diff --git a/CHANGES b/CHANGES
index e62701177..02071650a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2405,5 +2405,5 @@
 * domains: add well known config UI (for jitsi configuration)
 * Prefix email addon variables with CLOUDRON_EMAIL instead of CLOUDRON_MAIL
 * remove support for manifest version 1
-
+* Add option to enable/disable mailbox sharing
 
diff --git a/src/infra_version.js b/src/infra_version.js
index e50e21f8e..8a411d51a 100644
--- a/src/infra_version.js
+++ b/src/infra_version.js
@@ -20,7 +20,7 @@ exports = module.exports = {
         'postgresql': { repo: 'cloudron/postgresql', tag: 'cloudron/postgresql:4.1.1@sha256:86e4e2f4fd43809efca7c9cb1def4d7608cf36cb9ea27052f9b64da4481db43a' },
         'mongodb': { repo: 'cloudron/mongodb', tag: 'cloudron/mongodb:4.0.2@sha256:9df297ccc3370f38c54f8d614e214e082b363777cd1c6c9522e29663cc8f5362' },
         'redis': { repo: 'cloudron/redis', tag: 'cloudron/redis:3.0.4@sha256:5c60de75d078ae609da5565f32dcd91030f45907e945756cc976ff207b8c6199' },
-        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:3.5.1@sha256:5fd56a8ec1b655c4c2b5fc9fc9d6f89b22a6e0cd0f1d119b19ba535d0df233e8' },
+        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:3.6.0@sha256:f67c3659d5122153f746f009e3a61a49619f95b838f357fcdf02024276252036' },
         'graphite': { repo: 'cloudron/graphite', tag: 'cloudron/graphite:3.0.1@sha256:bed9f6b5d06fe2c5289e895e806cfa5b74ad62993d705be55d4554a67d128029' },
         'sftp': { repo: 'cloudron/sftp', tag: 'cloudron/sftp:3.4.2@sha256:810306478c3dac7caa7497e5f6381cc7ce2f68aafda849a4945d39a67cc04bc1' }
     }
diff --git a/src/server.js b/src/server.js
index 2bde61879..3d959a922 100644
--- a/src/server.js
+++ b/src/server.js
@@ -280,6 +280,8 @@ function initializeExpressSync() {
     router.post('/api/v1/mailserver/dnsbl_config',            token, authorizeAdmin, routes.mailserver.proxy);
     router.get ('/api/v1/mailserver/solr_config',             token, authorizeAdmin, routes.mailserver.proxy);
     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/usage',                   token, authorizeMailManager, routes.mailserver.proxy);
 
     router.get ('/api/v1/mail/:domain',                               token, authorizeMailManager, routes.mail.getDomain);