X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/5c28a6614161480f04a1783bc7441bc90f50dfb9..792f19f8caedc5f6fbb467c3834d2155404d1ded:/procmail/get-msgid

diff --git a/procmail/get-msgid b/procmail/get-msgid
index 3c3bfe3..50fbef4 100644
--- a/procmail/get-msgid
+++ b/procmail/get-msgid
@@ -10,7 +10,7 @@
   {
     LOG="get-msgid:   lacking message-id, using resent-message-id...$NL"
     :0 fw
-    |$FORMAIL -R Resent-Message-Id Message-Id
+    |$FORMAIL -R Resent-Message-ID Message-ID
   }
 
   :0 E
@@ -36,7 +36,8 @@
 *$ MSGID ?? .+@$RE_MAILRELAYS>
 *$ !^Return-Path: .+@$RE_MAILRELAYS\>
 *$ !^Received: by $RE_MAILRELAYS \(postfix, from userid
+* MSGID ?? ^<\/[^>]+
 {
   LOG="get-msgid:   missing message ID added by one of our mail relays$NL"
-  MSGID="${MSGID}.MSGID-ADDED"
+  MSGID="<${MATCH}.MSGID-ADDED>"
 }