--- 1.32/check_message.conf	2020-12-10 16:53:15.332036738 -0700
+++ 1.33/check_message.conf	2021-09-14 17:17:25.028777230 -0600
@@ -33,10 +33,10 @@
     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:
+    set acl_m_subject = $rh_Subject:
+    remove_header = Subject : X-Old-Subject : X-Spam-Status
+    add_header = Subject: $acl_m_spam_subject$acl_m_subject
+    add_header = X-Old-Subject: $acl_m_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}