diff --git a/templates/master.cf.j2 b/templates/master.cf.j2
index 8a393a2..2eff692 100644
--- a/templates/master.cf.j2
+++ b/templates/master.cf.j2
@@ -12,7 +12,7 @@
 # ==========================================================================
 # SMTP: Port 25
 smtp      inet  n       -       y       -       -       smtpd
-#  -o content_filter=filter:
+  -o content_filter=filter:
 # Submission: Port 587
 submission inet n       -       y       -       -       smtpd
   -o smtpd_tls_security_level=encrypt
@@ -42,6 +42,7 @@ flush     unix  n       -       y       1000?   0       flush
 proxymap  unix  -       -       n       -       -       proxymap
 proxywrite unix -       -       n       -       1       proxymap
 smtp      unix  -       -       y       -       -       smtp
+  -o content_filter=filter:
 # When relaying mail as backup MX, disable fallback_relay to avoid MX loops
 relay     unix  -       -       y       -       -       smtp
         -o smtp_fallback_relay=
@@ -53,6 +54,7 @@ discard   unix  -       -       y       -       -       discard
 local     unix  -       n       n       -       -       local
 virtual   unix  -       n       n       -       -       virtual
 lmtp      unix  -       -       y       -       -       lmtp
+  -o content_filter=filter:
 anvil     unix  -       -       y       -       1       anvil
 scache    unix  -       -       y       -       1       scache
 #
@@ -132,8 +134,8 @@ amavis unix y y y - 2 smtp
         -o strict_rfc821_envelopes=yes
         -o receive_override_options=no_unknown_recipient_checks,no_header_body_checks
 filter     unix    -       n       n       -       -       pipe
+  flags=Rq user=filter argv=/usr/local/bin/mail_processor.py -f ${sender} -r ${recipient}
 #  flags=Rq user=filter argv=/etc/postfix/scripts/disclaimer.sh -f ${sender} -- ${recipient}
-  flags=Rq user=filter argv=/etc/postfix/scripts/disclaimer.sh -f ${sender} -- ${recipient}
 policy-spf  unix  -       n       n       -       -       spawn
        user=nobody argv=/usr/bin/policyd-spf
 greypolicy unix -   n    n   -  -   spawn