diff --git a/install/tpl/debian_postfix.conf.master b/install/tpl/debian_postfix.conf.master
index 8bd34f6928b8a57c516bf4edd848c7892f8018c8..f9aa2e55accfd5dea9f155e12217ed0dfb92e12f 100644
--- a/install/tpl/debian_postfix.conf.master
+++ b/install/tpl/debian_postfix.conf.master
@@ -33,8 +33,9 @@ smtpd_client_restrictions = check_client_access proxy:mysql:{config_dir}/mysql-v
 smtpd_etrn_restrictions = permit_mynetworks, reject
 smtpd_data_restrictions = permit_mynetworks, reject_unauth_pipelining, reject_multi_recipient_bounce, permit
 smtpd_client_message_rate_limit = 100
-maildrop_destination_concurrency_limit = 1
-maildrop_destination_recipient_limit   = 1
+# Needed for courier pop3/imap only
+# maildrop_destination_concurrency_limit = 1
+# maildrop_destination_recipient_limit   = 1
 virtual_transport = maildrop
 header_checks = regexp:{config_dir}/header_checks
 mime_header_checks = regexp:{config_dir}/mime_header_checks
diff --git a/install/tpl/fedora_postfix.conf.master b/install/tpl/fedora_postfix.conf.master
index 8d2b1a9dc25b5211e0c7a42dfb69354d53455b78..fd735b1a1891d44c6ed944949b0002bad82026e8 100644
--- a/install/tpl/fedora_postfix.conf.master
+++ b/install/tpl/fedora_postfix.conf.master
@@ -29,8 +29,9 @@ smtpd_client_restrictions = check_client_access proxy:mysql:{config_dir}/mysql-v
 smtpd_etrn_restrictions = permit_mynetworks, reject
 smtpd_data_restrictions = permit_mynetworks, reject_unauth_pipelining, reject_multi_recipient_bounce, permit
 smtpd_client_message_rate_limit = 100
-maildrop_destination_concurrency_limit = 1
-maildrop_destination_recipient_limit   = 1
+# Needed for courier pop3/imap only
+# maildrop_destination_concurrency_limit = 1
+# maildrop_destination_recipient_limit   = 1
 virtual_transport = maildrop
 header_checks = regexp:{config_dir}/header_checks
 mime_header_checks = regexp:{config_dir}/mime_header_checks
diff --git a/install/tpl/opensuse_postfix.conf.master b/install/tpl/opensuse_postfix.conf.master
index 03f134bb0804ae2d70f12afef0068736e5b1e506..e12fbe03ca369fcff900b9343a8df16681db223a 100644
--- a/install/tpl/opensuse_postfix.conf.master
+++ b/install/tpl/opensuse_postfix.conf.master
@@ -31,8 +31,9 @@ smtpd_client_restrictions = check_client_access proxy:mysql:{config_dir}/mysql-v
 smtpd_etrn_restrictions = permit_mynetworks, reject
 smtpd_data_restrictions = permit_mynetworks, reject_unauth_pipelining, reject_multi_recipient_bounce, permit
 smtpd_client_message_rate_limit = 100
-maildrop_destination_concurrency_limit = 1
-maildrop_destination_recipient_limit   = 1
+# Needed for courier pop3/imap only
+# maildrop_destination_concurrency_limit = 1
+# maildrop_destination_recipient_limit   = 1
 virtual_transport = maildrop
 header_checks = regexp:{config_dir}/header_checks
 mime_header_checks = regexp:{config_dir}/mime_header_checks