diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index f7dad9d1e8..8a58b7156f 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -3938,18 +3938,7 @@ public class HtmlHelper {
     }
 
     static void clearComposingText(TextView view) {
-        view.clearComposingText();
-
-        CharSequence text = view.getText();
-        if (text instanceof Spannable) {
-            Spannable edit = (Spannable) text;
-            Object[] spans = edit.getSpans(0, edit.length(), Object.class);
-            if (spans == null || spans.length == 0)
-                return;
-            for (Object span : spans)
-                if (span instanceof SuggestionSpan)
-                    edit.removeSpan(span);
-        }
+        //view.clearComposingText();
     }
 
     static Spanned fromHtml(@NonNull String html, Context context) {
diff --git a/app/src/main/java/eu/faircode/email/LanguageTool.java b/app/src/main/java/eu/faircode/email/LanguageTool.java
index 9c7c1f12d9..d5a188501f 100644
--- a/app/src/main/java/eu/faircode/email/LanguageTool.java
+++ b/app/src/main/java/eu/faircode/email/LanguageTool.java
@@ -449,7 +449,7 @@ public class LanguageTool {
                     continue;
                 } else
                     Log.i("LT text='" + edit.subSequence(s, e) + "' " + suggestion);
-                edit.setSpan(span, s, e, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE | Spanned.SPAN_COMPOSING);
+                edit.setSpan(span, s, e, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
             }
     }