diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 2ebaa6e6fb..e0b631a585 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -2838,7 +2838,7 @@ public class FragmentCompose extends FragmentBase {
                 etBody.setText(body);
 
                 int start = args.getInt("start");
-                if (start < body.length())
+                if (start <= body.length())
                     etBody.setSelection(start);
             }