From b6b71cbf42bf59570a99b200acfba214926ab835 Mon Sep 17 00:00:00 2001 From: cketti Date: Thu, 25 Oct 2018 00:51:06 +0200 Subject: [PATCH] Don't strip \r from quoted text --- .../main/java/com/fsck/k9/message/quote/TextQuoteCreator.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/core/src/main/java/com/fsck/k9/message/quote/TextQuoteCreator.java b/app/core/src/main/java/com/fsck/k9/message/quote/TextQuoteCreator.java index 382349fbf..63ba17e9a 100644 --- a/app/core/src/main/java/com/fsck/k9/message/quote/TextQuoteCreator.java +++ b/app/core/src/main/java/com/fsck/k9/message/quote/TextQuoteCreator.java @@ -46,8 +46,7 @@ public class TextQuoteCreator { final String escapedPrefix = prefix.replaceAll("(\\\\|\\$)", "\\\\$1"); quotedText.append(wrappedText.replaceAll("(?m)^", escapedPrefix)); - // TODO is this correct? - return quotedText.toString().replaceAll("\\\r", ""); + return quotedText.toString(); } else if (quoteStyle == QuoteStyle.HEADER) { StringBuilder quotedText = new StringBuilder(body.length() + QUOTE_BUFFER_LENGTH); quotedText.append("\r\n");