Special case

app/src/main/java/eu/faircode/email/FragmentCompose.java

@@ -1717,6 +1717,7 @@ public class FragmentCompose extends FragmentBase {
                             draft.thread = ref.thread;
 
                             // Special case
+                            if (BuildConfig.DEBUG) {
                                 String from = null;
                                 String to = null;
                                 String me = Helper.canonicalAddress(Helper.myAddress().getAddress());
@@ -1734,6 +1735,10 @@ public class FragmentCompose extends FragmentBase {
                                     draft.to = (ref.reply == null || ref.reply.length == 0 ? ref.from : ref.reply);
                                     draft.from = ref.to;
                                 }
+                            } else {
+                                draft.to = (ref.reply == null || ref.reply.length == 0 ? ref.from : ref.reply);
+                                draft.from = ref.to;
+                            }
 
                             if ("reply_all".equals(action)) {
                                 // Remove self from cc