X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/a9f9f1f2676165296aec089a6181bb8cfddc5131..98cee263303225880082bf968764b951bfe03ede:/procmail/tickle

diff --git a/procmail/tickle b/procmail/tickle
index fbb8a76..6b0276a 100644
--- a/procmail/tickle
+++ b/procmail/tickle
@@ -1,16 +1,21 @@
+# The X-Tickle header has priority over the Original-To address
 :0
-* ORIGINAL_TO ?? ^.+@tickle\.madduck\.net$
-* ORIGINAL_TO ?? ^\/[^@]+
-{ TICKLE="$MATCH" }
+*$ ^X-Tickle:${RE_SPACE}+\/${RE_NOT_SPACE}+
+{ 
+  TICKLE="$MATCH"
+  :0 fw
+  |$FORMAIL -IX-Tickle
+}
 
 :0 E
-*$ ^X-Tickle:${RE_SPACE}+\/${RE_NOT_SPACE}+
+* ! POSTPONED ?? .
+* ORIGINAL_TO ?? ^.+@tickle\.madduck\.net$
+* ORIGINAL_TO ?? ^\/[^@]+
 { TICKLE="$MATCH" }
 
 :0
 * TICKLE ?? .
 * ! DEST ?? .
-* ! TICKLE_DELIVERED ?? .
 {
   DAILY_DELIVERY_TIME=04:20
   JUST_DATE="`$BIN_DATE -d \"$DATE\" +%x`"