Work-around Message-IDs that are brokenly in the form <id@@Domain>

Fixes issue #962
jstedfast · Oct 15, 2023 · 79046cd · 79046cd
1 parent 7dc832b
commit 79046cd
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/MimeKit/Utils/ParseUtils.cs b/MimeKit/Utils/ParseUtils.cs
@@ -493,6 +493,12 @@ public static bool TryParseMsgId (byte[] text, ref int index, int endIndex, bool
 				token.Append ('@');
 				index++;
 
+				// Note: some Message-Id's are broken and in the form "<local-part@@domain>"
+				//
+				// See https://github.com/jstedfast/MimeKit/issues/962 for details.
+				while (index < endIndex && text[index] == (byte) '@')
+					index++;
+
 				if (!SkipCommentsAndWhiteSpace (text, ref index, endIndex, throwOnError))
 					return false;