diff --git a/setup/mail-dovecot.sh b/setup/mail-dovecot.sh
index b08098f2..230908b0 100755
--- a/setup/mail-dovecot.sh
+++ b/setup/mail-dovecot.sh
@@ -183,6 +183,7 @@ plugin {
   sieve_after = $STORAGE_ROOT/mail/sieve/global_after
   sieve = $STORAGE_ROOT/mail/sieve/%d/%n.sieve
   sieve_dir = $STORAGE_ROOT/mail/sieve/%d/%n
+  sieve_redirect_envelope_from = orig_recipient'
 }
 EOF
 
@@ -192,12 +193,6 @@ EOF
 cp conf/sieve-spam.txt /etc/dovecot/sieve-spam.sieve
 sievec /etc/dovecot/sieve-spam.sieve
 
-# Adjust sieve to use local account's address as envelope-from in forwarding
-# mails to external MTAs (#1946).
-grep sieve_redirect_envelope_from /etc/dovecot/conf.d/99-local-sieve.conf  &>/dev/null || \
-	sed -i /etc/dovecot/conf.d/99-local-sieve.conf -e '/^}$/ i\
-  sieve_redirect_envelope_from = orig_recipient'
-
 # PERMISSIONS
 
 # Ensure configuration files are owned by dovecot and not world readable.