diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index f0bbd04fb3..1f81baa3a5 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -5615,12 +5615,15 @@ public class FragmentCompose extends FragmentBase {
         if (target == null)
             return;
 
+        int s = (start < end ? start : end);
+        int e = (start < end ? end : start);
+
         getMainHandler().post(new Runnable() {
             @Override
             public void run() {
                 try {
-                    if (target instanceof EditText && start >= 0)
-                        ((EditText) target).setSelection(start, end < 0 ? start : end);
+                    if (target instanceof EditText && s >= 0)
+                        ((EditText) target).setSelection(s, e < 0 ? s : e);
 
                     target.requestFocus();