From: martin f. krafft <madduck@madduck.net>
Date: Sun, 2 Mar 2008 17:13:40 +0000 (+0100)
Subject: fix handling of X-Postponed header
X-Git-Url: https://git.madduck.net/etc/mailfilter.git/commitdiff_plain/98cee263303225880082bf968764b951bfe03ede?ds=sidebyside

fix handling of X-Postponed header
---

diff --git a/procmail/delay-delivery b/procmail/delay-delivery
index cfe3403..38f7c4e 100644
--- a/procmail/delay-delivery
+++ b/procmail/delay-delivery
@@ -1,8 +1,11 @@
 #TODO: create config/delay-(disabled|tonight|weekend)
 
-:0 fw
+:0
 * POSTPONED ?? .
-|$FORMAIL -R X-Postponed X-Was-Postponed
+{
+  :0 fw
+  |$FORMAIL -R X-Postponed X-Was-Postponed
+}
 
 :0 E
 * ! DISABLE_DELAYS ?? .
@@ -27,6 +30,7 @@
     POSTPONED="$RELEASE_TS ($RELEASE_TIME)"
 
     INCLUDERC=$PMDIR/record-delayed-mail
+    INCLUDERC=$PMDIR/addheaders
 
     :0
     $DELAYED_QUEUE