Add fallback handling

bbottema · Dec 18, 2019 · cee5b13 · cee5b13
1 parent 2e56b57
commit cee5b13
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/org/simplejavamail/outlookmessageparser/model/OutlookMessage.java b/src/main/java/org/simplejavamail/outlookmessageparser/model/OutlookMessage.java
@@ -313,7 +313,11 @@ public Map<String, OutlookFileAttachment> fetchCIDMap() {
 			for (final OutlookAttachment attachment : getOutlookAttachments()) {
 				if (attachment instanceof OutlookFileAttachment) {
 					final OutlookFileAttachment fileAttachment = (OutlookFileAttachment) attachment;
-					tryAddCid(cidMap, html, fileAttachment, fileAttachment.getContentId());
+					if (!tryAddCid(cidMap, html, fileAttachment, fileAttachment.getContentId())) {
+						if (!tryAddCid(cidMap, html, fileAttachment, fileAttachment.getFilename())) {
+							tryAddCid(cidMap, html, fileAttachment, fileAttachment.getLongFilename());
+						}
+					}
 				}
 			}
 		}