diff --git a/app/src/main/java/eu/faircode/email/EntityMessage.java b/app/src/main/java/eu/faircode/email/EntityMessage.java
index 24ad79b689..55c34a81dd 100644
--- a/app/src/main/java/eu/faircode/email/EntityMessage.java
+++ b/app/src/main/java/eu/faircode/email/EntityMessage.java
@@ -19,8 +19,6 @@ package eu.faircode.email;
     Copyright 2018 by Marcel Bokhorst (M66B)
 */
 
-import android.text.TextUtils;
-
 import java.util.Date;
 import java.util.Random;
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 5834681b50..ddc62aee4d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -538,9 +538,19 @@ public class FragmentCompose extends FragmentEx {
                     return draft;
 
                 EntityMessage ref = db.message().getMessage(reference);
-                if (ref != null)
+                if (ref != null) {
                     account = ref.account;
 
+                    // Reply to sender
+                    EntityFolder rfolder = db.folder().getFolder(ref.folder);
+                    if (EntityFolder.SENT.equals(rfolder.type)) {
+                        Address[] tmp = ref.to;
+                        ref.to = ref.from;
+                        ref.reply = null;
+                        ref.from = tmp;
+                    }
+                }
+
                 EntityFolder drafts;
                 drafts = db.folder().getFolderByType(account, EntityFolder.DRAFTS);
                 if (drafts == null)