diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 8ab65eea47..154eb9c2fd 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -1903,13 +1903,6 @@ public class FragmentCompose extends FragmentEx {
 
                 last_available = available;
 
-                if (action == R.id.action_send)
-                    if (draft.replying != null || draft.forwarding != null) {
-                        body += HtmlHelper.getQuote(context,
-                                draft.replying == null ? draft.forwarding : draft.replying, false);
-                        dirty = true;
-                    }
-
                 if (dirty) {
                     // Update draft
                     draft.identity = ident;
diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 2f34c4aefd..6089bf0bcc 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -295,6 +295,9 @@ public class MessageHelper {
         DB db = DB.getInstance(context);
 
         String html = message.read(context);
+        if (message.replying != null || message.forwarding != null)
+            html += HtmlHelper.getQuote(context,
+                    message.replying == null ? message.forwarding : message.replying, false);
 
         StringBuilder body = new StringBuilder();
         body.append(html);
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 7f6c576d6a..30d850dd81 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -1812,6 +1812,13 @@ public class ServiceSynchronize extends LifecycleService {
             EntityLog.log(this, "Sent via " + ident.host + "/" + ident.user +
                     " to " + TextUtils.join(", ", to));
 
+            if (message.replying != null || message.forwarding != null) {
+                String html = message.read(ServiceSynchronize.this);
+                html += HtmlHelper.getQuote(ServiceSynchronize.this,
+                        message.replying == null ? message.forwarding : message.replying, false);
+                message.write(ServiceSynchronize.this, html);
+            }
+
             try {
                 db.beginTransaction();