X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/d855421675244ca1154a6d5668bb2e41940cd7b9..9afcad17ab7735c44d98866cf1ba530a28ba66bc:/procmail/delay-delivery

diff --git a/procmail/delay-delivery b/procmail/delay-delivery
index aef22e1..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