#179: Convert all embedded / INLINE resources to ATTACHMENT resources…

… if the cid does not occur in the HTML

src/main/java/org/simplejavamail/converter/internal/mimemessage/MimeMessageParser.java

@@ -38,11 +38,12 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.TreeMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.TreeMap;
 
 import static java.lang.String.format;
+import static org.simplejavamail.internal.util.MiscUtil.extractCID;
 import static org.simplejavamail.internal.util.MiscUtil.valueNullOrEmpty;
 
 /**
@@ -120,9 +121,10 @@ public static ParsedMimeMessageComponents parseMimeMessage(@Nonnull final MimeMe
 		parsedComponents.fromAddress = parseFromAddress(mimeMessage);
 		parsedComponents.replyToAddresses = parseReplyToAddresses(mimeMessage);
 		parseMimePartTree(mimeMessage, parsedComponents);
+		moveInvalidEmbeddedResourcesToAttachments(parsedComponents);
 		return parsedComponents;
 	}
-	
+
 	private static void parseMimePartTree(@Nonnull final MimePart currentPart, @Nonnull final ParsedMimeMessageComponents parsedComponents) {
 		for (final Header header : retrieveAllHeaders(currentPart)) {
 			parseHeader(header, parsedComponents);
@@ -144,10 +146,10 @@ private static void parseMimePartTree(@Nonnull final MimePart currentPart, @Nonn
 			}
 		} else {
 			final DataSource ds = createDataSource(currentPart);
-			// If the diposition is not provided, the part should be treated as attachment
-			if (disposition == null || Part.ATTACHMENT.equalsIgnoreCase(disposition)) {
+			// if the diposition is not provided, for now the part should be treated as inline (later non-embedded inline attachments are moved)
+			if (Part.ATTACHMENT.equalsIgnoreCase(disposition)) {
 				parsedComponents.attachmentList.put(parseResourceName(parseContentID(currentPart), parseFileName(currentPart)), ds);
-			} else if (Part.INLINE.equalsIgnoreCase(disposition)) {
+			} else if (disposition == null || Part.INLINE.equalsIgnoreCase(disposition)) {
 				if (parseContentID(currentPart) != null) {
 					parsedComponents.cidMap.put(parseContentID(currentPart), ds);
 				} else {
@@ -482,6 +484,16 @@ public static String parseMessageId(@Nonnull final MimeMessage mimeMessage) {
 			throw new MimeMessageParseException(MimeMessageParseException.ERROR_GETTING_MESSAGE_ID, e);
 		}
 	}
+
+	private static void moveInvalidEmbeddedResourcesToAttachments(ParsedMimeMessageComponents parsedComponents) {
+		final String htmlContent = parsedComponents.htmlContent.toString();
+		for (Map.Entry<String, DataSource> cidEntry : parsedComponents.cidMap.entrySet()) {
+			if (!htmlContent.contains("cid:" + extractCID(cidEntry.getKey()))) {
+				parsedComponents.attachmentList.put(cidEntry.getKey(), cidEntry.getValue());
+				parsedComponents.cidMap.remove(cidEntry.getKey());
+			}
+		}
+	}
 
 	public static class ParsedMimeMessageComponents {
 		private final Map<String, DataSource> attachmentList = new TreeMap<>();