diff --git a/core/nginx/conf/nginx.conf b/core/nginx/conf/nginx.conf
index 777b2a3d..8fcda1c3 100644
--- a/core/nginx/conf/nginx.conf
+++ b/core/nginx/conf/nginx.conf
@@ -94,7 +94,7 @@ http {
         rewrite ^({{ WEB_WEBMAIL }})$ $1/ permanent;
         rewrite ^{{ WEB_WEBMAIL }}/(.*) /$1 break;
         include /etc/nginx/proxy.conf;
-        client_max_body_size 30M;
+        client_max_body_size {{ MESSAGE_SIZE_LIMIT|int + 8388608 }};
         proxy_pass http://$webmail;
       }
       {% endif %}