diff --git a/core/dovecot/conf/dovecot.conf b/core/dovecot/conf/dovecot.conf
index 81811cdb..ab5cb43a 100644
--- a/core/dovecot/conf/dovecot.conf
+++ b/core/dovecot/conf/dovecot.conf
@@ -50,7 +50,7 @@ plugin {
   fts_autoindex_exclude = \Trash
   {% endif %}
 
-  {% if COMPRESSION in [ 'gz', 'bz2' ] %}
+  {% if COMPRESSION in [ 'gz', 'bz2', 'xz', 'lz4' ] %}
   zlib_save = {{ COMPRESSION }}
   {% endif %}
 
diff --git a/docs/compose/.env b/docs/compose/.env
index 7f91c270..b4a8b218 100644
--- a/docs/compose/.env
+++ b/docs/compose/.env
@@ -97,7 +97,7 @@ WELCOME_SUBJECT=Welcome to your new email account
 WELCOME_BODY=Welcome to your new email account, if you can read this, then it is configured properly!
 
 # Maildir Compression
-# choose compression-method, default: none (value: bz2, gz)
+# choose compression-method, default: none (value: gz, bz2, xz, lz4)
 COMPRESSION=
 # change compression-level, default: 6 (value: 1-9)
 COMPRESSION_LEVEL=
diff --git a/setup/flavors/compose/mailu.env b/setup/flavors/compose/mailu.env
index 44452e36..04148b40 100644
--- a/setup/flavors/compose/mailu.env
+++ b/setup/flavors/compose/mailu.env
@@ -86,7 +86,7 @@ WELCOME_SUBJECT={{ welcome_subject or 'Welcome to your new email account' }}
 WELCOME_BODY={{ welcome_body or 'Welcome to your new email account, if you can read this, then it is configured properly!' }}
 
 # Maildir Compression
-# choose compression-method, default: none (value: bz2, gz)
+# choose compression-method, default: none (value: gz, bz2, xz, lz4)
 COMPRESSION={{ compression }}
 # change compression-level, default: 6 (value: 1-9)
 COMPRESSION_LEVEL={{ compression_level }}
diff --git a/tests/compose/core/mailu.env b/tests/compose/core/mailu.env
index b13e57c5..edea6a5c 100644
--- a/tests/compose/core/mailu.env
+++ b/tests/compose/core/mailu.env
@@ -92,7 +92,7 @@ DMARC_RUF=admin
 
 
 # Maildir Compression
-# choose compression-method, default: none (value: bz2, gz)
+# choose compression-method, default: none (value: gz, bz2, xz, lz4)
 COMPRESSION=
 # change compression-level, default: 6 (value: 1-9)
 COMPRESSION_LEVEL=
diff --git a/tests/compose/fetchmail/mailu.env b/tests/compose/fetchmail/mailu.env
index 636a09a9..4a53ec46 100644
--- a/tests/compose/fetchmail/mailu.env
+++ b/tests/compose/fetchmail/mailu.env
@@ -92,7 +92,7 @@ DMARC_RUF=admin
 
 
 # Maildir Compression
-# choose compression-method, default: none (value: bz2, gz)
+# choose compression-method, default: none (value: gz, bz2, xz, lz4)
 COMPRESSION=
 # change compression-level, default: 6 (value: 1-9)
 COMPRESSION_LEVEL=
diff --git a/tests/compose/filters/mailu.env b/tests/compose/filters/mailu.env
index b6d5ca8f..1106deb0 100644
--- a/tests/compose/filters/mailu.env
+++ b/tests/compose/filters/mailu.env
@@ -92,7 +92,7 @@ DMARC_RUF=admin
 
 
 # Maildir Compression
-# choose compression-method, default: none (value: bz2, gz)
+# choose compression-method, default: none (value: gz, bz2, xz, lz4)
 COMPRESSION=
 # change compression-level, default: 6 (value: 1-9)
 COMPRESSION_LEVEL=
diff --git a/tests/compose/rainloop/mailu.env b/tests/compose/rainloop/mailu.env
index 9c31c8bb..d02b98f2 100644
--- a/tests/compose/rainloop/mailu.env
+++ b/tests/compose/rainloop/mailu.env
@@ -92,7 +92,7 @@ DMARC_RUF=admin
 
 
 # Maildir Compression
-# choose compression-method, default: none (value: bz2, gz)
+# choose compression-method, default: none (value: gz, bz2, xz, lz4)
 COMPRESSION=
 # change compression-level, default: 6 (value: 1-9)
 COMPRESSION_LEVEL=
diff --git a/tests/compose/roundcube/mailu.env b/tests/compose/roundcube/mailu.env
index dc503268..e1005487 100644
--- a/tests/compose/roundcube/mailu.env
+++ b/tests/compose/roundcube/mailu.env
@@ -92,7 +92,7 @@ DMARC_RUF=admin
 
 
 # Maildir Compression
-# choose compression-method, default: none (value: bz2, gz)
+# choose compression-method, default: none (value: gz, bz2, xz, lz4)
 COMPRESSION=
 # change compression-level, default: 6 (value: 1-9)
 COMPRESSION_LEVEL=
diff --git a/tests/compose/webdav/mailu.env b/tests/compose/webdav/mailu.env
index 90fb25b1..58b9810a 100644
--- a/tests/compose/webdav/mailu.env
+++ b/tests/compose/webdav/mailu.env
@@ -92,7 +92,7 @@ DMARC_RUF=admin
 
 
 # Maildir Compression
-# choose compression-method, default: none (value: bz2, gz)
+# choose compression-method, default: none (value: gz, bz2, xz, lz4)
 COMPRESSION=
 # change compression-level, default: 6 (value: 1-9)
 COMPRESSION_LEVEL=