From 623857cb80528cbfa8695d597ba3550a67c07006 Mon Sep 17 00:00:00 2001
From: Vincent Richard <vincent@vincent-richard.net>
Date: Fri, 14 Oct 2005 18:21:43 +0000
Subject: [PATCH] Not an attachment if a 'Content-Id' field is present.

---
 src/attachmentHelper.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/attachmentHelper.cpp b/src/attachmentHelper.cpp
index 0388ae7c..82e19f3f 100644
--- a/src/attachmentHelper.cpp
+++ b/src/attachmentHelper.cpp
@@ -64,6 +64,11 @@ const bool attachmentHelper::isBodyPartAnAttachment(ref <const bodyPart> part)
 		if (type.getType() != mediaTypes::TEXT &&
 		    type.getType() != mediaTypes::MULTIPART)
 		{
+			// If a "Content-Id" field is present, it might be an
+			// embedded object (MHTML messages)
+			if (part->getHeader()->hasField(vmime::fields::CONTENT_ID))
+				return false;
+
 			return true;
 		}
 	}