diff --git a/javascript/src/helpers/mailparser.js b/javascript/src/helpers/mailparser.js
index 5e3d8adfd339968f9f158e1badb76114597db66c..2eb29c24e1622d6d0fc78997454c15ff2050932a 100644
--- a/javascript/src/helpers/mailparser.js
+++ b/javascript/src/helpers/mailparser.js
@@ -301,7 +301,8 @@ export function getHTML(mime, parts) {
       continue;
     }
     contentDisposition = contentDisposition[0];
-    if (contentDisposition.indexOf("inline") >= 0) {
+    if (contentDisposition.indexOf("attachment") >= 0 || contentDisposition.indexOf("inline") >= 0) {
+
       let contentId = getHeaderValue("content-id", parts[i]);
       if (contentId === null || contentId === undefined) {
         continue;
@@ -315,7 +316,7 @@ export function getHTML(mime, parts) {
       if (contentType === null || contentType === undefined) {
         continue;
       }
-      contentType = contentType[0];
+      contentType = contentType[0].split(";")[0];
       const normalizedBody = getBody(mime, parts[i]).replace(newline, "");
       const src = "data:" + contentType + ";base64, " + normalizedBody;
       html = html.split(contentId).join(src);