diff --git a/defaults/main.yml b/defaults/main.yml
index d1d1580..043441f 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -81,4 +81,6 @@ spamassassin_milter_whitelisted_networks: '127.0.0.1/8'
 spamassassin_milter_reject_limit: 15
 spamassassin_milter_change_headers: True
 spamassassin_milter_ssl_enabled: '{{ spamassassin_spamd_ssl_enabled }}'
+# In bytes
+spamassassin_milter_spamc_max_msg_size: '512000'
 
diff --git a/templates/spamass-milter_sysconfig.j2 b/templates/spamass-milter_sysconfig.j2
index 78e5a0d..9e58d46 100644
--- a/templates/spamass-milter_sysconfig.j2
+++ b/templates/spamass-milter_sysconfig.j2
@@ -5,4 +5,4 @@
 ### spamass-milter-root.service instead of spamass-milter.service if you
 ### wish to do this but otherwise it's best to run as the unprivileged user
 ### sa-milt by using the normal spamass-milter.service
-EXTRA_FLAGS="{% if not spamassassin_milter_change_headers %}-m {% endif %}{% if spamassassin_milter_set_pref_dom_and_user %}-e {{ spamassassin_milter_pref_default_domain }} -u {{ spamassassin_milter_pref_default_user }}{% endif %} -r {{ spamassassin_milter_reject_limit }} -C {{ spamassassin_milter_reject_code }} -R '{{ spamassassin_milter_reject_message }}' {% if spamassassin_milter_exclude_whitelisted_networks %}-i {{ spamassassin_milter_whitelisted_networks }}{% endif %} {% if spamassassin_milter_connect_to_external_spamd %}-- -d {{ spamassassin_milter_external_spamd_hosts }} -p {{ spamassassin_milter_external_spamd_port }}{% if spamassassin_milter_external_round_robin_hosts %} -H{% endif %}{%if spamassassin_milter_ssl_enabled %} -S{% endif %}{% endif %}"
+EXTRA_FLAGS="{% if not spamassassin_milter_change_headers %}-m {% endif %}{% if spamassassin_milter_set_pref_dom_and_user %}-e {{ spamassassin_milter_pref_default_domain }} -u {{ spamassassin_milter_pref_default_user }}{% endif %} -r {{ spamassassin_milter_reject_limit }} -C {{ spamassassin_milter_reject_code }} -R '{{ spamassassin_milter_reject_message }}' {% if spamassassin_milter_exclude_whitelisted_networks %}-i {{ spamassassin_milter_whitelisted_networks }}{% endif %} {% if spamassassin_milter_connect_to_external_spamd %}-- -d {{ spamassassin_milter_external_spamd_hosts }} -p {{ spamassassin_milter_external_spamd_port }}{% if spamassassin_milter_external_round_robin_hosts %} -H{% endif %}{%if spamassassin_milter_ssl_enabled %} -S{% endif %}{% endif %} -s {{ spamassassin_milter_spamc_max_msg_size }}"