--- 1.12/check_message.conf	2016-10-18 15:52:21.000000000 -0500
+++ 1.13/check_message.conf	2016-10-18 16:10:20.000000000 -0500
@@ -20,6 +20,9 @@
     condition = ${if !eq{$acl_m_spam_user}{nobody}}
     spam = $acl_m_spam_user/defer_ok
     set acl_m_spam_subject = ${perl{get_spam_subject}}
+    add_header = X-Old-Subject:$h_Subject
+    remove_header = Subject
+    remove_header = X-Spam-Status
     add_header = Subject:$acl_m_spam_subject$h_Subject:
     add_header = X-Spam-Status: Yes, score=$spam_score, +EASY_IS_SPAM total spam score
     set acl_m_easy69 = ${eval:$acl_m_easy69 + EASY_IS_SPAM}
@@ -28,6 +31,7 @@
     condition = ${if !eq{$acl_m_esf_skip}{1}}
     condition = ${if >= {$message_size}{EASY_SPAMASSASSIN_MAX_SIZE}}
     condition = ${if !eq{$acl_m_spam_user}{nobody}}
+    remove_header = X-Spam-Status
     add_header = X-Spam-Status: No, message_size=$message_size larger than EASY_SPAMASSASSIN_MAX_SIZE
 
   drop
@@ -42,6 +46,7 @@
     logwrite = drop message based on users high-scoring-spam setting ($spam_score_int >= $acl_m_high_score_drop)
 
   warn
+    remove_header = SpamTally
     add_header = SpamTally: Final spam score: $acl_m_easy69
 
   drop