From bf9ce3e9dfc36c9d9ff34afb6f9dc944a3d774a0 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 10 Jan 2019 13:44:31 +0000
Subject: [PATCH] Body text is not an attachment

---
 .../main/java/eu/faircode/email/MessageHelper.java    | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 34512f3a78..3efc94a9c7 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -519,7 +519,16 @@ public class MessageHelper {
     }
 
     private static String getHtml(Part part) throws MessagingException, IOException {
-        if (part.isMimeType("text/plain") || part.isMimeType("text/html")) {
+        String disposition;
+        try {
+            disposition = part.getDisposition();
+        } catch (MessagingException ex) {
+            Log.w(ex);
+            disposition = null;
+        }
+
+        if (!Part.ATTACHMENT.equalsIgnoreCase(disposition) &&
+                (part.isMimeType("text/plain") || part.isMimeType("text/html"))) {
             String s;
             try {
                 Object content = part.getContent();