X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/519207b89004aa4a4b360767fa30aa48afaa6139..b3338ec6a5a8bb8aa937e49846aa891b753c12fc:/procmail/tickle

diff --git a/procmail/tickle b/procmail/tickle
index 6b0276a..0a40a1b 100644
--- a/procmail/tickle
+++ b/procmail/tickle
@@ -1,11 +1,7 @@
 # The X-Tickle header has priority over the Original-To address
 :0
 *$ ^X-Tickle:${RE_SPACE}+\/${RE_NOT_SPACE}+
-{ 
-  TICKLE="$MATCH"
-  :0 fw
-  |$FORMAIL -IX-Tickle
-}
+{ TICKLE="$MATCH" }
 
 :0 E
 * ! POSTPONED ?? .
@@ -54,10 +50,16 @@
   JUST_DATE
   DAILY_DELIVERY_TIME
 
-  LOG="tickle:      delaying message until $DELAY$NL"
+  :0
+  { RELEASE="`$BIN_DATE -d \"$DELAY\" +'%s (%c)'`" }
+
+  LOG="tickle:      delaying message until $RELEASE$NL"
   DELAYED_QUEUE=$TICKLER_QUEUE
 
-  # unset DISABLE_DELAYS to enable delaying for tickle messages
+  :0 fw
+  |$FORMAIL -I"X-Tickle: $RELEASE"
+
+  # unset DISABLE_DELAYS to always enable delaying for tickle messages
   DISABLE_DELAYS
 }