From: martin f. krafft <madduck@madduck.net>
Date: Mon, 3 Mar 2008 11:52:20 +0000 (+0100)
Subject: do not use addheaders for postpone
X-Git-Url: https://git.madduck.net/etc/mailfilter.git/commitdiff_plain/4d08a1263be6ae9cbc9800b42b266ec3549a0bb7?ds=sidebyside

do not use addheaders for postpone
---

diff --git a/procmail/addheaders b/procmail/addheaders
index 6d739c1..cbfc9ed 100644
--- a/procmail/addheaders
+++ b/procmail/addheaders
@@ -14,8 +14,4 @@
 * EQ_DOMAIN ?? .
 |$FORMAIL -A"X-EqDomain: $ORIG_DOMAIN" -A"X-EqTo: $EQ_LOCAL@$EQ_DOMAIN"
 
-:0 fw
-* POSTPONED ?? .
-|$FORMAIL -I"X-Postponed: $POSTPONED"
-
 # vim:ft=procmail
diff --git a/procmail/delay-delivery b/procmail/delay-delivery
index 6a4717c..65f02e5 100644
--- a/procmail/delay-delivery
+++ b/procmail/delay-delivery
@@ -33,11 +33,11 @@
     { RELEASE_TIME="$MATCH" }
 
     LOG="delay:       delay delivery of $MSGID until $RELEASE_TIME$NL"
-    POSTPONED="$RELEASE_TS ($RELEASE_TIME)"
 
-    INCLUDERC=$PMDIR/record-delayed-mail
-    INCLUDERC=$PMDIR/addheaders
+    :0 fw
+    |$FORMAIL -I"X-Postponed: $RELEASE_TS ($RELEASE_TIME)"
 
+    INCLUDERC=$PMDIR/record-delayed-mail
     :0
     $DELAYED_QUEUE
   }