X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/8dde77c861da2fb8c14e2ce651423691db664f47..15c8a9a5d97f1d2ac843765a35a02690c8a73148:/procmail/spamfilter

diff --git a/procmail/spamfilter b/procmail/spamfilter
index 066b9cb..9e88642 100755
--- a/procmail/spamfilter
+++ b/procmail/spamfilter
@@ -29,16 +29,21 @@ PMDIR=${PMDIR:-$HOME/.etc/mailfilter/procmail}
 #  |$FORMAIL -I"X-Spam: spamtrapped"
 #}
 
-# check whether this message is being reinjected
-TRAINED_AS
+# check whether this message is being resubmitted
 :0
 *$ $MSG_DEJAVU
-* ^X-Trained-As: \/(h|sp)am
 {
-  LOG="spamfilter:  skipping already trained $MATCH$NL"
   :0
-  * MATCH ?? spam
-  { IS_SPAM=already-trained }
+  * TRAINED_AS ?? .
+  {
+    LOG="spamfilter:  skipping already trained $TRAINED_AS$NL"
+    :0
+    * TRAINED_AS ?? spam
+    { IS_SPAM=already-trained }
+  }
+
+  :0 E
+  { LOG="spamfilter:  skipping resubmitted message$NL" }
 }
 
 # let earlier parts of the mailfilter cause bypassing the checks
@@ -261,6 +266,7 @@ TRAINED_AS
   |$FORMAIL -I"X-Spam: spamtrapped ham"
   IS_SPAM=spamtrapped-ham
   RETRAIN=spam
+  SPAM_UNSURE
 }
 
 #VERBOSE=no