X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/0cedb2f205d3552104ef3f7edc1d0640fedbd4ff..7478c422e79142bfb2f067b002c627c063b33a8b:/procmail/cleanup

diff --git a/procmail/cleanup b/procmail/cleanup
index 0d71fd8..1ce8cf2 100644
--- a/procmail/cleanup
+++ b/procmail/cleanup
@@ -2,9 +2,17 @@
 * ^X-Trained-As: \/(h|sp)am
 { TRAINED_AS=$MATCH }
 
-# remove all headers our mailfilter adds
+# 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