X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/a8f2c04936c3cc265b67f8098934e067fa113701..0a23c4eb391215da52f5b0cd21c24ac383f75a2b:/procmail/delay-delivery

diff --git a/procmail/delay-delivery b/procmail/delay-delivery
index cd50135..a725164 100644
--- a/procmail/delay-delivery
+++ b/procmail/delay-delivery
@@ -15,9 +15,10 @@
 }
 
 :0 E
-* ? echo "$FROM" | $EGREP -qif $CONF/undelayed-senders
+* ! TICKLE ?? .
+* ? echo "$FROMEMAIL" | $EGREP -qif $CONF/undelayed-senders
 {
-  LOG="delay:       do not delay mail from $FROM$NL"
+  LOG="delay:       do not delay mail from $SENDER$NL"
 }
 
 :0 E
@@ -26,7 +27,7 @@
 {
   :0
   * ! RELEASE ?? .
-  { RELEASE="`$BIN_DATE -d \"$DELAY\" +'%s (%c)'`" }
+  { RELEASE="`$BIN_DATE -d \"$DELAY\" +'%s (%c %Z)'`" }
   DELAY
 
   :0