diff --git a/app/src/main/java/eu/faircode/email/EditTextCompose.java b/app/src/main/java/eu/faircode/email/EditTextCompose.java
index ab90a6692d..3cbfea9903 100644
--- a/app/src/main/java/eu/faircode/email/EditTextCompose.java
+++ b/app/src/main/java/eu/faircode/email/EditTextCompose.java
@@ -125,7 +125,7 @@ public class EditTextCompose extends FixedEditText {
                         String html = HtmlHelper.toHtml((Spanned) selected, context);
                         cbm.setPrimaryClip(ClipData.newHtmlText(context.getString(R.string.app_name), selected, html));
                         setSelection(end);
-                        return false;
+                        return true;
                     }
                 }
             } else if (id == android.R.id.paste) {
diff --git a/app/src/main/java/eu/faircode/email/FixedTextView.java b/app/src/main/java/eu/faircode/email/FixedTextView.java
index 6ad3b83850..ee6fa5a60f 100644
--- a/app/src/main/java/eu/faircode/email/FixedTextView.java
+++ b/app/src/main/java/eu/faircode/email/FixedTextView.java
@@ -392,11 +392,9 @@ public class FixedTextView extends AppCompatTextView {
                     if (selected instanceof Spanned) {
                         String html = HtmlHelper.toHtml((Spanned) selected, context);
                         cbm.setPrimaryClip(ClipData.newHtmlText(context.getString(R.string.app_name), selected, html));
-                        if (getText() instanceof Spannable) {
-                            Selection.removeSelection((Spannable) getText());
-                            return true;
-                        } else
-                            return false;
+                        if (getText() instanceof Spannable)
+                            Selection.setSelection((Spannable) getText(), end);
+                        return true;
                     }
                 }
             }