diff --git a/hosts/mail/modules/dovecot.nix b/hosts/mail/modules/dovecot.nix
index 9a47590..b7f25bd 100644
--- a/hosts/mail/modules/dovecot.nix
+++ b/hosts/mail/modules/dovecot.nix
@@ -189,10 +189,15 @@ in
         managesieve_logout_format = bytes ( in=%i : out=%o )
       }
 
+      lda_original_recipient_header = X-Original-To
+
       plugin {
         sieve_dir = /var/vmail/%d/%n/sieve/scripts/
         sieve = /var/vmail/%d/%n/sieve/active-script.sieve
-        sieve_extensions = +vacation-seconds +editheader
+        sieve_extensions = +vacation +vacation-seconds +editheader
+        sieve_vacation_use_original_recipient = yes
+        sieve_vacation_dont_check_recipient = yes
+        sieve_vacation_database = file:/var/vmail/%d/%n/sieve/vacation.db;
         sieve_vacation_min_period = 1min
 
         fts = lucene