From dd613d75459d5bb9878d016c503b1aec6a356d12 Mon Sep 17 00:00:00 2001
From: "martin f. krafft" <madduck@madduck.net>
Date: Sun, 23 Sep 2007 17:12:00 +0200
Subject: [PATCH 1/1] move more headers to earlier cleanup

---
 procmail/cleanup          | 5 ++++-
 procmail/pre-spam-cleanup | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/procmail/cleanup b/procmail/cleanup
index 0d71fd8..e367cd2 100644
--- a/procmail/cleanup
+++ b/procmail/cleanup
@@ -4,7 +4,10 @@
 
 # remove all headers our mailfilter adds
 :0 fw
-|$FORMAIL -IX-EqDomain -IX-EqTo -IX-Justme -IContent-Length
+|$FORMAIL -IX-EqDomain -IX-EqTo -IX-Justme \
+          -IX-Trained-As \
+          -IX-UID -IX-OfflineIMAP- \
+          -IX-Status -IStatus -IX-Keywords -IContent-Length
 
 # now should be idempotent
 
diff --git a/procmail/pre-spam-cleanup b/procmail/pre-spam-cleanup
index 93fee2a..2f66743 100755
--- a/procmail/pre-spam-cleanup
+++ b/procmail/pre-spam-cleanup
@@ -25,7 +25,7 @@ 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
+|$FORMAIL -IX-Virus -IX-Greylist \
+          -IX-Spam -IX-CRM114
 
 # now should be idempotent
-- 
2.39.5