Workaround incorrect content type

4 years ago · be53d3d00f
parent 295545d985
commit be53d3d00f
1 changed files with 14 additions and 0 deletions
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@ -2448,6 +2448,20 @@ public class MessageHelper {
                try {
                    // From the body structure
                    contentType = new ContentType(part.getContentType());
+
+                    // Workaround bodystructure not matching header
+                    if (part instanceof MimeMessage &&
+                            "text/plain".equalsIgnoreCase(contentType.getBaseType()))
+                        try {
+                            String[] c = part.getHeader("Content-type");
+                            if (c != null && c.length > 0) {
+                                ContentType ct = new ContentType(c[0]);
+                                if ("text/html".equalsIgnoreCase(ct.getBaseType()))
+                                    contentType = ct;
+                            }
+                        } catch (MessagingException ex) {
+                            Log.w(ex);
+                        }
                } catch (ParseException ex) {
                    if (part instanceof MimeMessage)
                        Log.w("MimeMessage content type=" + ex.getMessage());