diff --git a/install/tpl/rspamd_milter_headers.conf.master b/install/tpl/rspamd_milter_headers.conf.master
index d399bbf4ecc37e39ff900260a4884335767e9957..bd90acd63427cf5c134318ab609228f7fe9aa7f9 100644
--- a/install/tpl/rspamd_milter_headers.conf.master
+++ b/install/tpl/rspamd_milter_headers.conf.master
@@ -1,2 +1,10 @@
-use = ["x-spamd-bar", "x-spam-level", "authentication-results"];
-authenticated_headers = ["authentication-results"];
\ No newline at end of file
+use = ["x-spamd-bar", "x-spam-level", "x-spam-status", "authentication-results"];
+authenticated_headers = ["authentication-results"];
+routines {
+  remove-headers {
+    "X-Spam" = 0;
+    "X-Spamd-Bar" = 0;
+    "X-Spam-Level" = 0;
+    "X-Spam-Status" = 0;
+  }
+}
diff --git a/server/conf/autoresponder.master b/server/conf/autoresponder.master
index 114db23d640125eccc0fb4ba4f9454d704ad92c0..8a908f8492e1a7a8bc4d1c358e4fc4cc8b5b51f9 100644
--- a/server/conf/autoresponder.master
+++ b/server/conf/autoresponder.master
@@ -4,7 +4,7 @@ if ($RETURNCODE==1)
        {
        if (!/^List-Unsubscribe:.*/:h )
        {
-               if (!/^(X-Spam-Flag: YES|X-Spam: Yes|Subject: \*\*\*\s*SPAM\s*\*\*\*.*)/:h )
+               if (!/^(X-Spam-Flag: YES|X-Spam: Yes|X-Spam-Status: Yes)/:h )
                {
                   NOW=time
                   if ({start_date} lt $NOW && {end_date} gt $NOW)
@@ -20,4 +20,4 @@ if ($RETURNCODE==1)
                }
        }
        }
-}
\ No newline at end of file
+}
diff --git a/server/conf/sieve_filter.master b/server/conf/sieve_filter.master
index dd2dfb96473667b849fb98527d1551263d043b3a..16a39ec1801259d3acd74d6c36be6b1eb431787a 100644
--- a/server/conf/sieve_filter.master
+++ b/server/conf/sieve_filter.master
@@ -7,7 +7,7 @@ require ["fileinto", "mailbox", "regex", "date", "relational", "vacation", "imap
 
 <tmpl_if name="move_junk" op="==" value="y">
 # Move spam to spam folder
-if anyof (header :contains "X-Spam-Flag" "YES", header :contains "X-Spam" "Yes", header :contains "subject" "*** SPAM ***", header :contains "subject" "***SPAM***") {
+if anyof (header :contains "X-Spam-Flag" "YES", header :contains ["X-Spam", "X-Spam-Status"] "Yes") {
   fileinto :create "Junk";
   # Stop here so that we do not reply on spams
   stop;
@@ -33,7 +33,7 @@ require ["fileinto", "mailbox", "regex", "date", "relational", "vacation", "imap
 
 <tmpl_if name="move_junk" op="==" value="a">
 # Move spam to spam folder
-if anyof (header :contains "X-Spam-Flag" "YES", header :contains "X-Spam" "Yes", header :contains "subject" "*** SPAM ***", header :contains "subject" "***SPAM***") {
+if anyof (header :contains "X-Spam-Flag" "YES", header :contains ["X-Spam", "X-Spam-Status"] "Yes") {
   fileinto :create "Junk";
   # Stop here so that we do not reply on spams
   stop;
@@ -46,7 +46,7 @@ if anyof (header :contains "X-Spam-Flag" "YES", header :contains "X-Spam" "Yes",
 #################################################################
 
 # Move spam to spam folder
-if anyof (header :contains "X-Spam-Flag" "YES", header :contains "X-Spam" "Yes", header :contains "subject" "*** SPAM ***", header :contains "subject" "***SPAM***") {
+if anyof (header :contains "X-Spam-Flag" "YES", header :contains ["X-Spam", "X-Spam-Status"] "Yes") {
   # Stop here so that we do not reply on spams
   stop;
 }