diff --git a/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java b/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
index f64235b2..dcae7324 100644
--- a/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
+++ b/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
@@ -718,7 +718,7 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
      * @return {@link TextWatcher}
      */
     public TextWatcher initializeTextWatcher(ComposeAdapter.ComposeViewHolder holder) {
-        String pattern = "(.|\\s)*(@[\\w_-]+@[a-z0-9.\\-]+|@[\\w_-]+)";
+        String pattern = "(.|\\s)*(?<mention>@[\\w_-]+@[a-z0-9.\\-]+|@[\\w_-]+)";
         final Pattern mentionPattern = Pattern.compile(pattern);
 
         String patternTag = "^(.|\\s)*(#([\\w-]{2,}))$";
@@ -884,7 +884,7 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
                 matcherTag = tagPattern.matcher(searchIn);
                 matcherEmoji = emojiPattern.matcher(searchIn);
                 if (matcherMention.matches()) {
-                    String searchGroup = matcherMention.group();
+                    String searchGroup = matcherMention.group("mention");
                     accountsVM.searchAccounts(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, searchGroup, 10, true, false).observe((LifecycleOwner) context, accounts -> {
                         if (accounts == null) {
                             return;