diff --git a/library/roles/postfix-relay/templates/main.cf.j2 b/library/roles/postfix-relay/templates/main.cf.j2
index 9e7a09b9..04846327 100644
--- a/library/roles/postfix-relay/templates/main.cf.j2
+++ b/library/roles/postfix-relay/templates/main.cf.j2
@@ -55,6 +55,7 @@ inet_interfaces = localhost
 inet_protocols = ipv4
 {% endif %}
 mailbox_size_limit = 0
+message_size_limit = {{ postfix_message_size_limit }}
 recipient_delimiter = +
 default_destination_concurrency_limit = {{ postfix_default_destination_concurrency_limit }}
 {% if postfix_use_sasl_auth %}
@@ -77,7 +78,6 @@ smtpd_sasl_tls_security_options = {{ postfix_smtp_sasl_tls_security_options }}
 smtpd_helo_required = yes
 mynetworks = {{ postfix_mynetworks }}
 inet_interfaces = {{ postfix_interfaces }}
-message_size_limit = {{ postfix_message_size_limit }}
 
 # Don't talk to mail systems that don't know their own hostname.
 smtpd_helo_restrictions = reject_unknown_helo_hostname