From 977bf4ebd9d06d5ee7c493db630f53163e1525a3 Mon Sep 17 00:00:00 2001
From: "martin f. krafft" <madduck@madduck.net>
Date: Sun, 23 Sep 2007 17:03:01 +0200
Subject: [PATCH 1/1] cleanup headers we add earlier in the chain

---
 procmail/cleanup          | 6 ++++++
 procmail/pre-spam-cleanup | 2 +-
 procmail/procmailrc       | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 procmail/cleanup

diff --git a/procmail/cleanup b/procmail/cleanup
new file mode 100644
index 0000000..646d2ab
--- /dev/null
+++ b/procmail/cleanup
@@ -0,0 +1,6 @@
+# remove all headers our mailfilter adds
+:0 fw
+|$FORMAIL -IX-EqDomain -IX-EqTo -IX-Justme -IContent-Length
+
+# now should be idempotent
+
diff --git a/procmail/pre-spam-cleanup b/procmail/pre-spam-cleanup
index e360aad..93fee2a 100755
--- a/procmail/pre-spam-cleanup
+++ b/procmail/pre-spam-cleanup
@@ -26,6 +26,6 @@ PMDIR=${PMDIR:-$HOME/.etc/mailfilter/procmail}
 # remove other unwanted headers from all messages
 :0 fw
 |$FORMAIL -IX-Virus -IX-UID -IX-OfflineIMAP- -IX-Status -IStatus -IX-Keywords -IX-Greylist \
-          -IX-Spam -IX-CRM114 -IX-Auto -IX-Trained-As -IX-EqDomain -IX-EqTo -IX-Justme
+          -IX-Spam -IX-CRM114 -IX-Auto -IX-Trained-As
 
 # now should be idempotent
diff --git a/procmail/procmailrc b/procmail/procmailrc
index e1f817d..15ef1fb 100755
--- a/procmail/procmailrc
+++ b/procmail/procmailrc
@@ -20,6 +20,7 @@ INCLUDERC=$PMDIR/logging
 INCLUDERC=$PMDIR/msgid-index
 
 INCLUDERC=$PMDIR/dejavu
+INCLUDERC=$PMDIR/cleanup
 INCLUDERC=$PMDIR/eqdomains
 
 INCLUDERC=$PMDIR/duplicates
-- 
2.39.2