diff --git a/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt b/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt
index 9039346dcd..e554a6435e 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt
@@ -366,23 +366,20 @@ class MessageInputFragment : Fragment() {
                     var mentionSpan: Spans.MentionChipSpan
                     for (i in mentionSpans.indices) {
                         mentionSpan = mentionSpans[i]
-                        val start = editable.getSpanStart(mentionSpan)
-                        val end = editable.getSpanEnd(mentionSpan)
-                        Log.d("Julius", "S:$start E:$end")
+
+                        val what = editable.subSequence(
+                            editable.getSpanStart(mentionSpan),
+                            editable.getSpanEnd(mentionSpan)
+                        ).toString().trim { it <= ' ' }
+                        val error = what.length > mentionSpan.label.length
+
                         if (start >= editable.getSpanStart(mentionSpan) &&
-                            start < editable.getSpanEnd(mentionSpan)
+                            start < editable.getSpanEnd(mentionSpan) &&
+                            what != mentionSpan.label
                         ) {
-                            val what = editable.subSequence(
-                                editable.getSpanStart(mentionSpan),
-                                editable.getSpanEnd(mentionSpan)
-                            ).toString()
-
-                            if (what.trim { it <= ' ' } != mentionSpan.label
-                            ) {
-                                Log.d("Julius", "What: $what")
-                                Log.d("Julius", "MentionSpan removed: $mentionSpan")
-                                // FIXME error here- I knew it I was right, but why?
-                                // editable.removeSpan(mentionSpan)
+                            editable.removeSpan(mentionSpan)
+                            if (error) {
+                                Log.d("Julius", "Error: Fix mention")
                             }
                         }
                     }