]> 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:

fix OURDATE
[etc/mailfilter.git] / procmail / cleanup
index e367cd283a73decff66ca6bab5729ca5cc7a1955..0c57cc865a2e11b07f600557f2cda9860745f760 100644 (file)
@@ -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