mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Prevent bare linefeeds in PGP signed messages

This commit is contained in:
M66B 2023-03-16 15:05:19 +01:00
parent 983b96044e
commit 9cedb94e00
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/eu/faircode/email/MessageHelper.java
View File

@ -1087,6 +1087,15 @@ 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<String> flowed = new ArrayList<>();
for (String line : plainContent.split("\\r?\\n")) {