diff --git a/dovecot/conf/dovecot.conf b/dovecot/conf/dovecot.conf
index 33a33f64..4c55c3b3 100644
--- a/dovecot/conf/dovecot.conf
+++ b/dovecot/conf/dovecot.conf
@@ -3,8 +3,8 @@
 ###############
 log_path = /dev/stderr
 protocols = imap lmtp sieve
-postmaster_address = %{env:POSTMASTER}@%{env:DOMAIN}
-hostname = %{env:HOSTNAME}
+postmaster_address = {{ POSTMASTER }}@{{ DOMAIN }}
+hostname = {{ HOSTNAME }}
 mail_plugins = $mail_plugins quota
 submission_host = smtp
 
diff --git a/dovecot/conf/pigeonhole-sieve.dict b/dovecot/conf/pigeonhole-sieve.dict
index 711fd6bf..911f47da 100644
--- a/dovecot/conf/pigeonhole-sieve.dict
+++ b/dovecot/conf/pigeonhole-sieve.dict
@@ -1,5 +1,12 @@
 connect = /data/freeposte.db
 
+map {
+  pattern = priv/reply_enabled
+  table = user
+  username_field = email
+  value_field = reply_enabled
+}
+
 map {
   pattern = priv/reply_subject
   table = user
@@ -15,8 +22,15 @@ map {
 }
 
 map {
-  pattern = priv/forward
+  pattern = priv/forward_enabled
   table = user
   username_field = email
-  value_field = forward
+  value_field = forward_enabled
+}
+
+map {
+  pattern = priv/forward_destination
+  table = user
+  username_field = email
+  value_field = forward_destination
 }