handle delay disabling more verbosely

[etc/mailfilter.git] / procmail / cleanup

diff --git a/procmail/cleanup b/procmail/cleanup
index 3eacdd75ebb796a751b7779eca44727b9c936229..e22b58bf0d573b25e0d757830cf92e3cb9a2e9ae 100644 (file)
--- a/procmail/cleanup
+++ b/procmail/cleanup
@@ -1,17 +1,14 @@
-:0
-* ^X-Trained-As: \/(h|sp)am
-{ TRAINED_AS=$MATCH }
-
-# remove all headers added in the *local* mail chain
+# 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 \
 :0 fw
 |$FORMAIL \

-        # headers added by this mailfilter
-          -IX-EqDomain -IX-EqTo -IX-Justme \
-        # headers added by the retraining system
+          -IX-EqDomain -IX-EqTo -IX-Justme -IX-Spamtrapped \

           -IX-Trained-As \
           -IX-Trained-As \

-        # headers added by offlineimap

           -IX-UID -IX-OfflineIMAP- \
           -IX-UID -IX-OfflineIMAP- \

-        # headers added by the MUA

           -IX-Status -IStatus -IX-Keywords -IContent-Length
 
 # now should be idempotent
           -IX-Status -IStatus -IX-Keywords -IContent-Length
 
 # now should be idempotent