X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/dd613d75459d5bb9878d016c503b1aec6a356d12..4cc46df1f4b20caa5db39a06610931be142a613f:/procmail/cleanup

diff --git a/procmail/cleanup b/procmail/cleanup
index e367cd2..0c57cc8 100644
--- a/procmail/cleanup
+++ b/procmail/cleanup
@@ -1,10 +1,12 @@
-:0
-* ^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 \
+|$FORMAIL \
+          -IX-EqDomain -IX-EqTo -IX-Justme -IX-Spamtrapped \
+          -IX-Delayed -IX-Tickle -IX-Resubmitted \
           -IX-Trained-As \
           -IX-UID -IX-OfflineIMAP- \
           -IX-Status -IStatus -IX-Keywords -IContent-Length