diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index cd41d7942d..1411d4de46 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -2731,7 +2731,7 @@ public class FragmentCompose extends FragmentBase {
                     edit.delete(start, end);
                     index = start;
                 } else
-                    index = end;
+                    index = etBody.length();
 
                 if (index < 0)
                     index = 0;
@@ -2814,7 +2814,7 @@ public class FragmentCompose extends FragmentBase {
                     edit.delete(start, end);
                     index = start;
                 } else
-                    index = end;
+                    index = etBody.length();
 
                 if (index < 0)
                     index = 0;