diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 53d8bf2741..88aa31d68b 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -2059,7 +2059,7 @@ public class FragmentCompose extends FragmentBase {
                                     draft.to = ref.to;
                                     draft.from = ref.from;
                                 } else {
-                                    draft.to = (ref.reply == null || ref.reply.length == 0 ? ref.from : ref.reply);
+                                    draft.to = recipient;
                                     draft.from = ref.to;
                                 }
                             }