Modified TnefPart.ConvertToMessage() to promote lone multipart/mixed …

…parts to the message body Fixes issue #789
jstedfast · May 19, 2022 · 3c04ff7 · 3c04ff7
1 parent 1fac7d4
commit 3c04ff7
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/MimeKit/Tnef/TnefPart.cs b/MimeKit/Tnef/TnefPart.cs
@@ -732,6 +732,12 @@ static MimeMessage ExtractTnefMessage (TnefReader reader)
 					message.Dispose ();
 					throw;
 				}
+
+				if (attachments.Count == 1) {
+					message.Body = attachments[0];
+					attachments.Clear (false);
+					attachments.Dispose ();
+				}
 			} else {
 				message.Body = body;
 			}
@@ -768,9 +774,8 @@ public MimeMessage ConvertToMessage ()
 					codepage = 0;
 			}
 
-			using (var reader = new TnefReader (Content.Open (), codepage, TnefComplianceMode.Loose)) {
+			using (var reader = new TnefReader (Content.Open (), codepage, TnefComplianceMode.Loose))
 				return ExtractTnefMessage (reader);
-			}
 		}
 
 		/// <summary>