]> git.madduck.net Git - etc/mailfilter.git/blobdiff - procmail/cleanup

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

add padi to skips
[etc/mailfilter.git] / procmail / cleanup
index 0d71fd81932e2e700a88ddc9d21a3084afa6b97a..b73929142b7507fb64f76993ad665c9d238ad8bb 100644 (file)
@@ -1,10 +1,15 @@
-: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
+#      (but not X-Tickle, X-Delayed, or X-Resubmitted)
+#   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