From dc6cf712c0ed53915b57e10086b319fd750d16d7 Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 16 Mar 2023 17:33:46 +0100 Subject: [PATCH] Revert "Prevent bare linefeeds in PGP signed messages" This reverts commit 9cedb94e0022224a2046e361720e0c47554ce00b. --- app/src/main/java/eu/faircode/email/MessageHelper.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java index bf865c287a..b4dc725c64 100644 --- a/app/src/main/java/eu/faircode/email/MessageHelper.java +++ b/app/src/main/java/eu/faircode/email/MessageHelper.java @@ -1087,15 +1087,6 @@ public class MessageHelper { String plainContent = HtmlHelper.getText(context, document.html()); String plainContentType = "text/plain; charset=" + Charset.defaultCharset().name(); - if (EntityMessage.PGP_SIGNONLY.equals(message.ui_encrypt)) { - // 550 5.6.11 SMTPSEND.BareLinefeedsAreIllegal; message contains bare linefeeds, which cannot be sent via DATA and receiving system does not support BDAT (failed) - // https://learn.microsoft.com/en-us/exchange/troubleshoot/email-delivery/ndr/fix-error-code-550-5-6-11-in-exchange-online - plainContent = plainContent - .replaceAll("\r\n", "\n") - .replaceAll("\r", "") - .replaceAll("\n", "\r\n"); - } - if (format_flowed) { List flowed = new ArrayList<>(); for (String line : plainContent.split("\\r?\\n")) {