diff --git a/templates/misc/configfiles/debian_wheezy/postfix_courier/etc_postfix_main.cf b/templates/misc/configfiles/debian_wheezy/postfix_courier/etc_postfix_main.cf
index ad6cabfb..6ac51137 100644
--- a/templates/misc/configfiles/debian_wheezy/postfix_courier/etc_postfix_main.cf
+++ b/templates/misc/configfiles/debian_wheezy/postfix_courier/etc_postfix_main.cf
@@ -688,8 +688,9 @@ smtpd_sender_restrictions = permit_mynetworks,
 smtpd_client_restrictions = permit_mynetworks,
 	permit_sasl_authenticated,
 	reject_unknown_client_hostname
-
-smtpd_relay_restrictions = permit_mynetworks,permit_sasl_authenticated,defer_unauth_destination
+smtpd_relay_restrictions = permit_mynetworks,
+	permit_sasl_authenticated,
+	defer_unauth_destination
 
 # Maximum size of Message in bytes (50MB)
 message_size_limit = 52428800
diff --git a/templates/misc/configfiles/debian_wheezy/postfix_dovecot/etc_postfix_main.cf b/templates/misc/configfiles/debian_wheezy/postfix_dovecot/etc_postfix_main.cf
index 0c2a8213..b797bed2 100644
--- a/templates/misc/configfiles/debian_wheezy/postfix_dovecot/etc_postfix_main.cf
+++ b/templates/misc/configfiles/debian_wheezy/postfix_dovecot/etc_postfix_main.cf
@@ -688,8 +688,9 @@ smtpd_sender_restrictions = permit_mynetworks,
 smtpd_client_restrictions = permit_mynetworks,
 	permit_sasl_authenticated,
 	reject_unknown_client_hostname
-
-smtpd_relay_restrictions = permit_mynetworks,permit_sasl_authenticated,defer_unauth_destination
+smtpd_relay_restrictions = permit_mynetworks,
+	permit_sasl_authenticated,
+	defer_unauth_destination
 
 # Maximum size of Message in bytes (50MB)
 message_size_limit = 52428800
diff --git a/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_main.cf b/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_main.cf
index b9f9a22a..6c168222 100644
--- a/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_main.cf
+++ b/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_main.cf
@@ -36,10 +36,9 @@ smtpd_sender_restrictions = permit_mynetworks,
 smtpd_client_restrictions = permit_mynetworks,
 	permit_sasl_authenticated,
 	reject_unknown_client_hostname
-
-# Postfix 2.10 requires this option. Postfix < 2.10 ignores this.
-# The option is intentionally left empty.
-smtpd_relay_restrictions = 
+smtpd_relay_restrictions = permit_mynetworks,
+	permit_sasl_authenticated,
+	defer_unauth_destination
 
 # Maximum size of Message in bytes (512MB)
 message_size_limit = 536870912
diff --git a/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_main.cf b/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_main.cf
index b8934a30..aab90ae7 100644
--- a/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_main.cf
+++ b/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_main.cf
@@ -43,9 +43,9 @@ smtpd_client_restrictions = permit_mynetworks,
 	permit_sasl_authenticated,
 	reject_unknown_client
 
-# Postfix 2.10 requires this option. Postfix < 2.10 ignores this.
-# The option is intentionally left empty.
-smtpd_relay_restrictions = 
+smtpd_relay_restrictions = permit_mynetworks,
+	permit_sasl_authenticated,
+	defer_unauth_destination
 
 # Maximum size of Message in bytes (512MB)
 message_size_limit = 536870912