Body text is not an attachment

6 years ago · bf9ce3e9df
parent b92819222a
commit bf9ce3e9df
1 changed files with 10 additions and 1 deletions
--- 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();