diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index b6643464cf..6f5422a339 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -2305,7 +2305,10 @@ public class FragmentCompose extends FragmentBase {
                             }
                         }
 
-                        String refBody = String.format("<p>%s %s:</p>\n<blockquote>%s</blockquote>",
+                        if ("reply".equals(action) || "reply_all".equals(action))
+                            refText = "<blockquote>" + refText + "</blockquote>";
+
+                        String refBody = String.format("<p>%s %s:</p>\n%s",
                                 Html.escapeHtml(new Date(ref.received).toString()),
                                 Html.escapeHtml(MessageHelper.formatAddresses(ref.from)),
                                 refText);