X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/122f13badd406cf378fb4f57197d27ddebb4d15b..0a23c4eb391215da52f5b0cd21c24ac383f75a2b:/procmail/get-msgid

diff --git a/procmail/get-msgid b/procmail/get-msgid
index 61eca10..02b10b1 100644
--- a/procmail/get-msgid
+++ b/procmail/get-msgid
@@ -1,12 +1,12 @@
 :0
-* ^Message-Id:[ 	]*\/[^ 	]+
+*$ ^Message-Id:$RE_SPACE*\/$RE_NOT_SPACE+
 { MSGID="$MATCH" }
 
 :0
-* MSGID ?? ^[ 	]*$|^<>$
+*$ MSGID ?? ^$RE_SPACE*$|^<>$
 {
   :0
-  * ^Resent-Message-Id:[ 	]*\/[^  ]+
+  *$ ^Resent-Message-Id:$RE_SPACE*\/$RE_NOT_SPACE+
   {
     LOGLATER="get-msgid:   lacking message-id, using resent-message-id...$NL"
     :0 fw
@@ -21,7 +21,7 @@
   }
 
   :0
-  * ^Message-Id:[ 	]*\/[^  ]+
+  *$ ^Message-Id:$RE_EXTRACT_HEADER_VALUE
   { MSGID="$MATCH" }
 }