X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/864bba9e27d4b47043898efaa709281986ba36ff..e39f14a06d6795ba0348bfca8bd3b43c2754242e:/procmail/delay-delivery

diff --git a/procmail/delay-delivery b/procmail/delay-delivery
index 9e8e02a..a725164 100644
--- a/procmail/delay-delivery
+++ b/procmail/delay-delivery
@@ -14,13 +14,20 @@
   LOG="delay:       delays disabled, thus not delaying$NL"
 }
 
+:0 E
+* ! TICKLE ?? .
+* ? echo "$FROMEMAIL" | $EGREP -qif $CONF/undelayed-senders
+{
+  LOG="delay:       do not delay mail from $SENDER$NL"
+}
+
 :0 E
 * 1^0 DELAY ?? .
 * 1^0 RELEASE ?? .
 {
   :0
   * ! RELEASE ?? .
-  { RELEASE="`$BIN_DATE -d \"$DELAY\" +'%s (%c)'`" }
+  { RELEASE="`$BIN_DATE -d \"$DELAY\" +'%s (%c %Z)'`" }
   DELAY
 
   :0
@@ -42,7 +49,6 @@
     :0 fw
     |$FORMAIL -I"X-Postponed: $RELEASE"
 
-    INCLUDERC=$PMDIR/record-delayed-mail
     :0
     $DELAYED_QUEUE
   }