From ae1e05761b80711fe09a263b8a62d236a458e022 Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 6 Oct 2025 13:42:54 +0200 Subject: [PATCH] Attach inline plain text parts with a filename --- app/src/main/java/eu/faircode/email/MessageHelper.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java index 410235899f..946074b7f5 100644 --- a/app/src/main/java/eu/faircode/email/MessageHelper.java +++ b/app/src/main/java/eu/faircode/email/MessageHelper.java @@ -5417,13 +5417,18 @@ public class MessageHelper { contentType = new ContentType(Helper.guessMimeType(filename)); } + boolean attach = false; String ct = contentType.getBaseType(); if (("text/plain".equalsIgnoreCase(ct) || "text/html".equalsIgnoreCase(ct)) && - TextUtils.isEmpty(filename) && !Part.ATTACHMENT.equalsIgnoreCase(disposition) && (size <= MAX_MESSAGE_SIZE || size == Integer.MAX_VALUE)) { parts.text.add(new PartHolder(part, contentType)); - } else { + if ("text/plain".equalsIgnoreCase(ct) && !TextUtils.isEmpty(filename)) + attach = true; + } else + attach = true; + + if (attach) { // Workaround for NIL message content type if ("application/octet-stream".equals(ct) && part instanceof MimeMessage) { ContentType plain = new ContentType("text/plain");