diff --git a/VERSION b/VERSION
index 3989355915..769e37e159 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.20.0
+1.20.2
diff --git a/src/status_im/chat/models/mentions.cljs b/src/status_im/chat/models/mentions.cljs
index f1d395602d..221696dd49 100644
--- a/src/status_im/chat/models/mentions.cljs
+++ b/src/status_im/chat/models/mentions.cljs
@@ -185,7 +185,7 @@
    [alias name nickname]))
 
 (defn add-searchable-phrases-to-contact
-  [{:keys [alias name added? blocked? identicon public-key nickname]} community-chat?]
+  [{:keys [alias name added? blocked? identicon public-key nickname ens-verified]} community-chat?]
   (when (and alias
              (not (string/blank? alias))
              (or name
@@ -194,11 +194,12 @@
                  community-chat?)
              (not blocked?))
     (add-searchable-phrases
-     {:alias      alias
-      :name       (or (utils/safe-replace name ".stateofus.eth" "") alias)
-      :identicon  identicon
-      :nickname   nickname
-      :public-key public-key})))
+     {:alias        alias
+      :name         (or (and ens-verified (utils/safe-replace name ".stateofus.eth" "")) alias)
+      :identicon    identicon
+      :nickname     nickname
+      :ens-verified ens-verified
+      :public-key   public-key})))
 
 (defn mentionable-contacts [contacts]
   (reduce
diff --git a/src/status_im/ui/screens/chat/components/input.cljs b/src/status_im/ui/screens/chat/components/input.cljs
index a589b12233..f49c87d7f9 100644
--- a/src/status_im/ui/screens/chat/components/input.cljs
+++ b/src/status_im/ui/screens/chat/components/input.cljs
@@ -218,16 +218,23 @@
   as arguments and returns new fx. Always clear all validation messages."
   {:events [:chat.ui.input/set-chat-input-text]}
   [{:keys [db] :as cofx} text chat-id]
-  (let [text-with-mentions (mentions/->input-field text)
-        contacts (:contacts db)
-        hydrated-mentions (map (fn [[t mention :as e]]
-                                 (if (= t :mention)
-                                   [:mention (str "@" (multiaccounts/displayed-name
-                                                       (or (get contacts mention)
-                                                           {:public-key mention})))]
-                                   e)) text-with-mentions)
-        info (mentions/->info hydrated-mentions)]
-    {:set-input-text [chat-id text]
+  (let [text-with-mentions   (mentions/->input-field text)
+        all-contacts         (:contacts/contacts db)
+        chat                 (get-in db [:chats chat-id])
+        current-multiaccount (:multiaccount db)
+        mentionable-users    (mentions/get-mentionable-users
+                              chat all-contacts current-multiaccount nil)
+        hydrated-mentions    (map
+                              (fn [[t mention :as e]]
+                                (if (= t :mention)
+                                  (let [mention (multiaccounts/displayed-name
+                                                 (get mentionable-users mention))]
+                                    [:mention (if (string/starts-with? mention "@")
+                                                mention (str "@" mention))])
+                                  e)) text-with-mentions)
+        info                 (mentions/->info hydrated-mentions)
+        new-text             (string/join (map second hydrated-mentions))]
+    {:set-input-text [chat-id new-text]
      :db
      (-> db
          (assoc-in [:chats/cursor chat-id] (:mention-end info))