diff --git a/.mergify.yml b/.mergify.yml
index 023bf59b..a950b0ca 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -2,15 +2,24 @@ pull_request_rules:
   - name: Successful travis and 2 approved reviews
     conditions:
       - status-success=continuous-integration/travis-ci/pr
+      - label!=["status"/wip","status/blocked"]
       - "#approved-reviews-by>=2"
     actions:
       merge:
         method: merge
+        strict: true
+      dismiss_reviews:
+        approved: true
+
   - name: Trusted author, successful travis and 1 approved review
     conditions:
       - author~=(kaiyou|muhlemmer|mildred|HorayNarea|adi90x|hoellen|ofthesun9)
       - status-success=continuous-integration/travis-ci/pr
+      - label!=["status"/wip","status/blocked","review/need2"]
       - "#approved-reviews-by>=1"
     actions:
       merge:
         method: merge
+        strict: true
+      dismiss_reviews:
+        approved: true
diff --git a/docs/compose/.env b/docs/compose/.env
index c9fce025..d517e8bc 100644
--- a/docs/compose/.env
+++ b/docs/compose/.env
@@ -63,6 +63,7 @@ ANTIVIRUS=none
 
 # Message size limit in bytes
 # Default: accept messages up to 50MB
+# Max attachment size will be 33% smaller
 MESSAGE_SIZE_LIMIT=50000000
 
 # Networks granted relay permissions
diff --git a/setup/flavors/compose/mailu.env b/setup/flavors/compose/mailu.env
index 9f3a2555..72aa195c 100644
--- a/setup/flavors/compose/mailu.env
+++ b/setup/flavors/compose/mailu.env
@@ -73,6 +73,7 @@ ANTISPAM={{ antispam_enabled or 'none'}}
 
 # Message size limit in bytes
 # Default: accept messages up to 50MB
+# Max attachment size will be 33% smaller
 MESSAGE_SIZE_LIMIT={{ message_size_limit or '50000000' }}
 
 # Networks granted relay permissions
diff --git a/webmails/rainloop/Dockerfile b/webmails/rainloop/Dockerfile
index db7403f5..92479489 100644
--- a/webmails/rainloop/Dockerfile
+++ b/webmails/rainloop/Dockerfile
@@ -22,7 +22,7 @@ RUN apt-get update && apt-get install -y \
  && rm -rf /var/lib/apt/lists
 
 COPY include.php /var/www/html/include.php
-COPY php.ini /usr/local/etc/php/conf.d/rainloop.ini
+COPY php.ini /php.ini
 
 COPY config.ini /config.ini
 COPY default.ini /default.ini
diff --git a/webmails/rainloop/config.ini b/webmails/rainloop/config.ini
index 7fb13889..6ae5fff7 100644
--- a/webmails/rainloop/config.ini
+++ b/webmails/rainloop/config.ini
@@ -1,7 +1,7 @@
 ; RainLoop Webmail configuration file
 
 [webmail]
-attachment_size_limit = 25
+attachment_size_limit = {{ MAX_FILESIZE }}
 
 [security]
 allow_admin_panel = Off
diff --git a/webmails/rainloop/php.ini b/webmails/rainloop/php.ini
index 9b241b46..39abbdd5 100644
--- a/webmails/rainloop/php.ini
+++ b/webmails/rainloop/php.ini
@@ -1,3 +1,4 @@
 date.timezone=UTC
-upload_max_filesize = 25M
-post_max_size = 25M
+upload_max_filesize = {{ MAX_FILESIZE }}M
+post_max_size = {{ MAX_FILESIZE }}M
+
diff --git a/webmails/rainloop/start.py b/webmails/rainloop/start.py
index 9e8465a2..4c116e09 100755
--- a/webmails/rainloop/start.py
+++ b/webmails/rainloop/start.py
@@ -10,6 +10,8 @@ convert = lambda src, dst: open(dst, "w").write(jinja2.Template(open(src).read()
 os.environ["FRONT_ADDRESS"] = os.environ.get("FRONT_ADDRESS", "front")
 os.environ["IMAP_ADDRESS"] = os.environ.get("IMAP_ADDRESS", "imap")
 
+os.environ["MAX_FILESIZE"] = str(int(int(os.environ.get("MESSAGE_SIZE_LIMIT"))*0.66/1048576))
+
 base = "/data/_data_/_default_/"
 shutil.rmtree(base + "domains/", ignore_errors=True)
 os.makedirs(base + "domains", exist_ok=True)
@@ -17,6 +19,7 @@ os.makedirs(base + "configs", exist_ok=True)
 
 convert("/default.ini", "/data/_data_/_default_/domains/default.ini")
 convert("/config.ini", "/data/_data_/_default_/configs/config.ini")
+convert("/php.ini", "/usr/local/etc/php/conf.d/rainloop.ini")
 
 os.system("chown -R www-data:www-data /data")
 
diff --git a/webmails/roundcube/Dockerfile b/webmails/roundcube/Dockerfile
index 14bee56e..00b843b2 100644
--- a/webmails/roundcube/Dockerfile
+++ b/webmails/roundcube/Dockerfile
@@ -7,7 +7,7 @@ RUN apt-get update && apt-get install -y \
 ENV ROUNDCUBE_URL https://github.com/roundcube/roundcubemail/releases/download/1.3.8/roundcubemail-1.3.8-complete.tar.gz
 
 RUN apt-get update && apt-get install -y \
-      zlib1g-dev \
+      zlib1g-dev python3-jinja2 \
  && docker-php-ext-install zip \
  && echo date.timezone=UTC > /usr/local/etc/php/conf.d/timezone.ini \
  && rm -rf /var/www/html/ \
@@ -22,7 +22,7 @@ RUN apt-get update && apt-get install -y \
  && chown -R www-data: logs temp \
  && rm -rf /var/lib/apt/lists
 
-COPY php.ini /usr/local/etc/php/conf.d/roundcube.ini
+COPY php.ini /php.ini
 COPY config.inc.php /var/www/html/config/
 COPY start.py /start.py
 
diff --git a/webmails/roundcube/php.ini b/webmails/roundcube/php.ini
index 9b241b46..39abbdd5 100644
--- a/webmails/roundcube/php.ini
+++ b/webmails/roundcube/php.ini
@@ -1,3 +1,4 @@
 date.timezone=UTC
-upload_max_filesize = 25M
-post_max_size = 25M
+upload_max_filesize = {{ MAX_FILESIZE }}M
+post_max_size = {{ MAX_FILESIZE }}M
+
diff --git a/webmails/roundcube/start.py b/webmails/roundcube/start.py
index 07b3a567..3a0bd0bc 100755
--- a/webmails/roundcube/start.py
+++ b/webmails/roundcube/start.py
@@ -1,6 +1,13 @@
 #!/usr/bin/python3
 
 import os
+import jinja2
+
+convert = lambda src, dst: open(dst, "w").write(jinja2.Template(open(src).read()).render(**os.environ))
+
+os.environ["MAX_FILESIZE"] = str(int(int(os.environ.get("MESSAGE_SIZE_LIMIT"))*0.66/1048576))
+
+convert("/php.ini", "/usr/local/etc/php/conf.d/roundcube.ini")
 
 # Fix some permissions
 os.system("mkdir -p /data/gpg")