(spam-necessary-extra-headers): make

spam-use-regex-headers trigger all the extra headers

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d3eef91..21333b5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-18  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * spam.el (spam-necessary-extra-headers): make
+       spam-use-regex-headers trigger all the extra headers
+
 2006-12-14  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>  (tiny change)
 
        * nnweb.el (nnweb-gmane-create-mapping): Keep the mapping stable for

diff --git a/lisp/spam.el b/lisp/spam.el
index ff2227b..5c2f9c8 100644 (file)
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -1154,9 +1154,11 @@ backends)."
              spam-use-spamassassin-headers
              spam-use-regex-headers)
       (push 'X-Spam-Status list))
-    (when spam-use-bogofilter
+    (when (or spam-use-bogofilter
+             spam-use-regex-headers)
       (push 'X-Bogosity list))
-    (when spam-use-crm114
+    (when (or spam-use-crm114
+             spam-use-regex-headers)
       (push 'X-CRM114-Status list))
     list))