clean up more headers before spam training

diff --git a/procmail/pre-spam-cleanup b/procmail/pre-spam-cleanup
index cb191288fc402a3dbbcc996d4ef267813de905fe..e360aad1deabc5b98a131efa6b5b5a87130cce98 100755 (executable)
--- a/procmail/pre-spam-cleanup
+++ b/procmail/pre-spam-cleanup
@@ -25,8 +25,7 @@ PMDIR=${PMDIR:-$HOME/.etc/mailfilter/procmail}
 
 # remove other unwanted headers from all messages
 :0 fw
-|$FORMAIL -IX-Virus-Scanned -IX-SenderIP -IX-ASN -IX-CIDR -IX-UID -IX-OfflineIMAP- \
-          -IX-Status -IStatus -IX-Keywords -IX-Greylist \
-          -IX-Spam -IX-CRM114 -IX-Auto -IX-Trained-As -IX-EqDomain -IX-EqTo
+|$FORMAIL -IX-Virus -IX-UID -IX-OfflineIMAP- -IX-Status -IStatus -IX-Keywords -IX-Greylist \
+          -IX-Spam -IX-CRM114 -IX-Auto -IX-Trained-As -IX-EqDomain -IX-EqTo -IX-Justme
 
 # now should be idempotent

diff --git a/spamassassin/user_prefs b/spamassassin/user_prefs
index 7aa67c5c3bf36321ebd5aa016231689be130d9b1..961e60386ad7fdb679a10c65bca86220107ec579 100644 (file)
--- a/spamassassin/user_prefs
+++ b/spamassassin/user_prefs
@@ -45,9 +45,9 @@ report_safe_copy_headers X-Greylist
 rewrite_header SUBJECT
 
 #bayes_path ~/.var/spamassassin/bayes
-bayes_auto_learn 1
+bayes_auto_learn 0
 bayes_ignore_header X-Original-To
-bayes_ignore_header X-Original-To-Saved #
+#bayes_ignore_header X-Original-To-Saved #
 bayes_ignore_header X-EqDomain
 bayes_ignore_header X-EqTo
 bayes_ignore_header X-Been-There
@@ -59,9 +59,9 @@ bayes_ignore_header X-CRM114-Status
 bayes_ignore_header X-CRM114-CacheID
 bayes_ignore_header X-CRM114-Notice
 bayes_ignore_header X-CRM114-Version
-bayes_ignore_header X-Sender-IP #
-bayes_ignore_header X-CIDR #
-bayes_ignore_header X-ASN #
+#bayes_ignore_header X-Sender-IP #
+#bayes_ignore_header X-CIDR #
+#bayes_ignore_header X-ASN #
 bayes_ignore_header X-Spam-Relays-External 
 bayes_ignore_header X-Spam-Relays-Internal
 bayes_ignore_header X-Spam-Relays-Trusted
@@ -69,6 +69,9 @@ bayes_ignore_header X-Spam-Relays-Untrusted
 bayes_ignore_header X-Spam-Status
 bayes_ignore_header X-Spam-Bayes
 bayes_ignore_header X-Spam-Level
+bayes_ignore_header X-Spam
+bayes_ignore_header X-Justme
+bayes_ignore_header X-Trained-As
 bayes_ignore_from add@ress.com #
 bayes_learn_to_journal 1