diff --git a/core/dovecot/conf/dovecot.conf b/core/dovecot/conf/dovecot.conf
index 81811cdb..6b97a086 100644
--- a/core/dovecot/conf/dovecot.conf
+++ b/core/dovecot/conf/dovecot.conf
@@ -21,7 +21,10 @@ mail_access_groups = mail
 maildir_stat_dirs = yes
 mailbox_list_index = yes
 mail_vsize_bg_after_count = 100
-mail_plugins = $mail_plugins quota quota_clone zlib{{ ' ' }}
+mail_plugins = $mail_plugins quota quota_clone{{ ' ' }}
+  {%- if COMPRESSION -%}
+  zlib{{ ' ' }}
+  {%- endif %}
   {%- if (FULL_TEXT_SEARCH or '').lower() not in ['off', 'false', '0'] -%}
   fts fts_xapian
   {%- endif %}
@@ -50,7 +53,7 @@ plugin {
   fts_autoindex_exclude = \Trash
   {% endif %}
 
-  {% if COMPRESSION in [ 'gz', 'bz2' ] %}
+  {% if COMPRESSION in [ 'gz', 'bz2', 'lz4', 'zstd' ] %}
   zlib_save = {{ COMPRESSION }}
   {% endif %}
 
diff --git a/docs/compose/.env b/docs/compose/.env
index 432b20b0..4df73080 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, lz4, zstd)
 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..0aabf478 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, lz4, zstd)
 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..a78515b8 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, lz4, zstd)
 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..afb57751 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, lz4, zstd)
 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..4c8c219d 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, lz4, zstd)
 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..08b0f8a4 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, lz4, zstd)
 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..faf1198f 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, lz4, zstd)
 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..939f453b 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, lz4, zstd)
 COMPRESSION=
 # change compression-level, default: 6 (value: 1-9)
 COMPRESSION_LEVEL=
diff --git a/towncrier/newsfragments/1694.feature b/towncrier/newsfragments/1694.feature
new file mode 100644
index 00000000..f7e2013e
--- /dev/null
+++ b/towncrier/newsfragments/1694.feature
@@ -0,0 +1 @@
+Support configuring lz4 and zstd compression for dovecot.