diff --git a/CHANGES b/CHANGES
index bede9a1d6..50fe11245 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2073,4 +2073,5 @@
 * Do not resize swap if swap file exists. This means that users can now control how swap is allocated on their own.
 * SFTP: fix issue where parallel rebuilds would cause an error
 * backups: make part size configurable
+* mail: set max email size
 
diff --git a/src/infra_version.js b/src/infra_version.js
index cd64fb2b3..29e40d722 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:3.0.0@sha256:b00e5118a8f829c422234117bf113803be79a1d5102c51497c6d3005b041ce37' },
         'mongodb': { repo: 'cloudron/mongodb', tag: 'cloudron/mongodb:3.0.0@sha256:59e50b1f55e433ffdf6d678f8c658812b4119f631db8325572a52ee40d3bc562' },
         'redis': { repo: 'cloudron/redis', tag: 'cloudron/redis:2.3.0@sha256:0e31ec817e235b1814c04af97b1e7cf0053384aca2569570ce92bef0d95e94d2' },
-        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:2.9.4@sha256:0e169b97a0584a76197d2bbc039d8698bf93f815588b3b43c251bd83dd545465' },
+        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:2.10.0@sha256:6ecd205af5b496dbead3e39d4c0ea9a0baff8930baec56b88683db3ddf9c3f30' },
         'graphite': { repo: 'cloudron/graphite', tag: 'cloudron/graphite:2.3.0@sha256:b7bc1ca4f4d0603a01369a689129aa273a938ce195fe43d00d42f4f2d5212f50' },
         'sftp': { repo: 'cloudron/sftp', tag: 'cloudron/sftp:2.0.2@sha256:cbd604eaa970c99ba5c4c2e7984929668e05de824172f880e8c576b2fb7c976d' }
     }
diff --git a/src/server.js b/src/server.js
index 2960f16a7..186d59ffe 100644
--- a/src/server.js
+++ b/src/server.js
@@ -252,6 +252,8 @@ function initializeExpressSync() {
     router.post('/api/v1/mailserver/clear_eventlog',    token, authorizeOwner, routes.mailserver.proxy);
     router.get ('/api/v1/mailserver/location',          token, authorizeAdmin, routes.mailserver.getLocation);
     router.post('/api/v1/mailserver/location',          token, authorizeAdmin, routes.mailserver.setLocation);
+    router.get ('/api/v1/mailserver/max_email_size',        token, authorizeAdmin, routes.mailserver.proxy);
+    router.post('/api/v1/mailserver/max_email_size',        token, authorizeAdmin, routes.mailserver.proxy);
 
     router.get ('/api/v1/mail/:domain',                               token, authorizeAdmin, routes.mail.getDomain);
     router.get ('/api/v1/mail/:domain/status',                        token, authorizeAdmin, routes.mail.getStatus);