This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 72c63d4d340ee9ebf834ce950f12b8ef74b150df Author: jcouteau <couteau@codelutin.com> Date: Thu Dec 10 16:37:38 2020 +0100 :bug: fixes #11116: Lors d’une réponse à un mail, du code s’affiche sur les mails qui ne sont pas en texte brut ce qui gêne la lisibilité. --- .../faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java index aaa0cf94..3e496c98 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java @@ -234,10 +234,10 @@ public class ReplyFormUIHandler extends AbstractFaxToMailUIHandler<ReplyFormUIMo String plainContent = StringUtils.join(demand.getPlainContent(), CONTENT_SEPARATOR); try(FaxToMailServiceContext serviceContext = getContext().newServiceContext()) { String htmlContent = serviceContext.getEmailService().extractHtmlContent(demand.getAttachment(), demand.getHtmlContent()); - if (htmlContent != null && !htmlContent.isEmpty()) { - quotedText = htmlContent; + if (plainContent != null && !plainContent.isEmpty()) { + quotedText = plainContent.replaceAll("\n", "<br/> "); } else { - quotedText = plainContent != null ? plainContent.replaceAll("\n", "<br/> ") : ""; + quotedText = htmlContent; } } catch (IOException eee){ log.error("Error setting maxAttachmentLength",eee); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.