X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/0db81b4fc15da6cfeb60377f705f9c161dd19689..3fbf937c6a6973eddaec854427371c21be037511:/procmail/cleanup

diff --git a/procmail/cleanup b/procmail/cleanup
index fe130d3..e22b58b 100644
--- a/procmail/cleanup
+++ b/procmail/cleanup
@@ -1,15 +1,12 @@
-:0
-* ^X-Trained-As: \/(h|sp)am
-{ TRAINED_AS=$MATCH }
-
 # remove all headers added in the *local* mail chain:
 #   1. added by this mailfilter
+#      (but not X-Tickle, X-Postponed, or X-Resubmitted)
 #   2. added by the retraining system
 #   3. added by offlineimap
 #   4. added by the MUA
 :0 fw
 |$FORMAIL \
-          -IX-EqDomain -IX-EqTo -IX-Justme \
+          -IX-EqDomain -IX-EqTo -IX-Justme -IX-Spamtrapped \
           -IX-Trained-As \
           -IX-UID -IX-OfflineIMAP- \
           -IX-Status -IStatus -IX-Keywords -IContent-Length