X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/977bf4ebd9d06d5ee7c493db630f53163e1525a3..2fe122be2f3654cdb90e54d784d4eee8f5058879:/procmail/cleanup

diff --git a/procmail/cleanup b/procmail/cleanup
index 646d2ab..1ce8cf2 100644
--- a/procmail/cleanup
+++ b/procmail/cleanup
@@ -1,6 +1,18 @@
-# remove all headers our mailfilter adds
+:0
+* ^X-Trained-As: \/(h|sp)am
+{ TRAINED_AS=$MATCH }
+
+# remove all headers added in the *local* mail chain:
+#   1. added by this mailfilter
+#   2. added by the retraining system
+#   3. added by offlineimap
+#   4. added by the MUA
 :0 fw
-|$FORMAIL -IX-EqDomain -IX-EqTo -IX-Justme -IContent-Length
+|$FORMAIL \
+          -IX-EqDomain -IX-EqTo -IX-Justme -IX-Spamtrapped \
+          -IX-Trained-As \
+          -IX-UID -IX-OfflineIMAP- \
+          -IX-Status -IStatus -IX-Keywords -IContent-Length
 
 # now should be idempotent