diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 69c0ed6c36..3ff0cb862a 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -210,7 +210,7 @@ public class FragmentCompose extends FragmentEx {
                                 new Handler().post(new Runnable() {
                                     @Override
                                     public void run() {
-                                        etSubject.requestFocus();
+                                        etTo.requestFocus();
                                     }
                                 });
 
@@ -703,6 +703,7 @@ public class FragmentCompose extends FragmentEx {
                 @Override
                 protected void onLoaded(Bundle args, Spanned body) {
                     etBody.setText(body);
+                    etBody.setSelection(0);
                 }
             }.load(FragmentCompose.this, a);
 
@@ -714,17 +715,6 @@ public class FragmentCompose extends FragmentEx {
             grpAddresses.setVisibility("reply_all".equals(action) ? View.VISIBLE : View.GONE);
             grpMessage.setVisibility(View.VISIBLE);
 
-            new Handler().postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    if ("reply".equals(action) || "reply_all".equals(action)) {
-                        etBody.requestFocus();
-                        etBody.setSelection(0);
-                    } else
-                        etTo.requestFocus();
-                }
-            }, 0);
-
             DB db = DB.getInstance(getContext());
 
             db.identity().liveIdentities(true).removeObservers(getViewLifecycleOwner());