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

diff --git a/procmail/cleanup b/procmail/cleanup
index 646d2ab..3eacdd7 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
 :0 fw
-|$FORMAIL -IX-EqDomain -IX-EqTo -IX-Justme -IContent-Length
+|$FORMAIL \
+        # headers added by this mailfilter
+          -IX-EqDomain -IX-EqTo -IX-Justme \
+        # headers added by the retraining system
+          -IX-Trained-As \
+        # headers added by offlineimap
+          -IX-UID -IX-OfflineIMAP- \
+        # headers added by the MUA
+          -IX-Status -IStatus -IX-Keywords -IContent-Length
 
 # now should be idempotent