X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/91238d9e32b5070521cf2314f99b53203109250d..67b726c2d3dfe128fc17fee55ccec6cb84d4152b:/procmail/delay-delivery

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