diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 78606dbe87..61aa0b5a05 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -1636,8 +1636,11 @@ public class FragmentCompose extends FragmentBase {
                                 }, null, getContext());
 
                                 int start = etBody.getSelectionStart();
-                                if (start < 0)
-                                    start = 0;
+                                if (start < 0) {
+                                    start = etBody.length() - 1;
+                                    if (start < 0)
+                                        start = 0;
+                                }
 
                                 etBody.getText().insert(start, spanned);