do not use addheaders for postpone

diff --git a/procmail/addheaders b/procmail/addheaders
index 6d739c119a5605a67905da40aff6605a15bada99..cbfc9ed6a3069b5edd2e391e0b6fb268fa32954d 100644 (file)
--- 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"
 
 * 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
 # vim:ft=procmail

diff --git a/procmail/delay-delivery b/procmail/delay-delivery
index 6a4717c3227479caba0b5f8922bfbfad885504ff..65f02e5eb64b3053662fc4aec0f4a7eb8e0c7145 100644 (file)
--- 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"
     { 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
   }
     :0
     $DELAYED_QUEUE
   }