diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 92b29827..8da7a8af 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -1033,6 +1033,12 @@ public class FragmentCompose extends FragmentEx {
                     getActivity().invalidateOptionsMenu();
                     etBody.setText(body);
                     etBody.setSelection(0);
+                    new Handler().post(new Runnable() {
+                        @Override
+                        public void run() {
+                            etTo.requestFocus();
+                        }
+                    });
                 }
             }.load(FragmentCompose.this, a);