diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index b6e491d247..ec5ef7454a 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -4328,8 +4328,10 @@ public class FragmentCompose extends FragmentBase {
                             db.answer().applyAnswer(a.id, new Date().getTime());
                             if (answer > 0)
                                 data.draft.subject = a.name;
-                            Document d = JsoupEx.parse(a.getHtml(null));
-                            document.body().append(d.body().html());
+                            if (TextUtils.isEmpty(external_body)) {
+                                Document d = JsoupEx.parse(a.getHtml(null));
+                                document.body().append(d.body().html());
+                            }
                         }
 
                         data.draft.signature = prefs.getBoolean("signature_new", true);