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 e16fdacd..d6239cac 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
@@ -890,7 +890,7 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
                         holder.binding.content.setAdapter(accountsListAdapter);
                         final String oldContent = holder.binding.content.getText().toString();
                         if (oldContent.length() >= currentCursorPosition) {
-                            String[] searchA = oldContent.substring(0, currentCursorPosition).split("@");
+                            String[] searchA = oldContent.substring(0, currentCursorPosition).split("\\s+@|^@");
                             if (searchA.length > 0) {
                                 final String search = searchA[searchA.length - 1];
                                 holder.binding.content.setOnItemClickListener((parent, view, position, id) -> {
@@ -906,7 +906,6 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
                                         if (currentCursorPosition >= oldContent.length())
                                             deltaSearch = oldContent.substring(currentCursorPosition - searchLength);
                                     }
-
                                     if (!search.equals(""))
                                         deltaSearch = deltaSearch.replace("@" + search, "");
                                     String newContent = oldContent.substring(0, currentCursorPosition - searchLength);
diff --git a/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java b/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java
index 86f959b7..f7663132 100644
--- a/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java
+++ b/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java
@@ -925,6 +925,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
         } else {
             holder.binding.username.setCompoundDrawables(null, null, null, null);
         }
+        //Button sizes depending of the defined scale
         float normalSize = Helper.convertDpToPixel(28, context);
         holder.binding.actionButtonReply.getLayoutParams().width = (int) (normalSize * scale);
         holder.binding.actionButtonReply.getLayoutParams().height = (int) (normalSize * scale);