diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index a1ab8ffca9..fe014c57ab 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -821,14 +821,14 @@ public class FragmentCompose extends FragmentEx {
text = text.replace("$name$", name == null ? "" : name);
}
draft.subject = context.getString(R.string.title_subject_reply, ref.subject);
- body = String.format("%s
%s %s:
%s",
+ body = String.format("%s
%s %s:
%s", text.replaceAll("\\r?\\n", "
%s", Html.escapeHtml(new Date().toString()), Html.escapeHtml(MessageHelper.getFormattedAddresses(ref.from, true)), HtmlHelper.sanitize(ref.read(context)));