diff --git a/WebRoot/js/zimbraMail/mail/model/ZmMailMsg.js b/WebRoot/js/zimbraMail/mail/model/ZmMailMsg.js
index d45edb92ce..8ea07d6b63 100755
--- a/WebRoot/js/zimbraMail/mail/model/ZmMailMsg.js
+++ b/WebRoot/js/zimbraMail/mail/model/ZmMailMsg.js
@@ -2153,7 +2153,8 @@ function(findHits, includeInlineImages, includeInlineAtts) {
 			if (!this.isRealAttachment(attach) ||
 					(attach.contentType.match(/^image/) && attach.contentId && attach.foundInMsgBody && !includeInlineImages) ||
 					(attach.contentDisposition == "inline" && attach.fileName && ZmMimeTable.isRenderable(attach.contentType, true) && !includeInlineAtts) ||
-					(attach.contentDisposition == "inline" && attach.contentType === "application/pdf" && attach.contentId && attach.foundInMsgBody)) {
+					(attach.contentDisposition == "inline" && attach.contentType === "application/pdf" && attach.contentId && attach.foundInMsgBody) ||
+					(attach.contentDisposition == "inline" || attach.contentDisposition == "attachment" && attach.contentType.match(/^image/) && attach.contentId && attach.foundInMsgBody)) {
 				continue;
 			}