diff --git a/ui/app/mainui/AppMain.qml b/ui/app/mainui/AppMain.qml
index 1a92c322f0..5305652b62 100644
--- a/ui/app/mainui/AppMain.qml
+++ b/ui/app/mainui/AppMain.qml
@@ -1353,7 +1353,7 @@ Item {
                                 currencyStore: appMain.currencyStore
                                 emojiPopup: statusEmojiPopup.item
                                 stickersPopup: statusStickersPopupLoader.item
-                                sendViaPersonalChatEnabled: featureFlagsStore.sendViaPersonalChatEnabled
+                                sendViaPersonalChatEnabled: featureFlagsStore.sendViaPersonalChatEnabled && appMain.networkConnectionStore.sendBuyBridgeEnabled
 
                                 onProfileButtonClicked: {
                                     Global.changeAppSectionBySectionType(Constants.appSection.profile);
diff --git a/ui/imports/shared/popups/send/views/RecipientView.qml b/ui/imports/shared/popups/send/views/RecipientView.qml
index 1c1557abcb..c34219c887 100644
--- a/ui/imports/shared/popups/send/views/RecipientView.qml
+++ b/ui/imports/shared/popups/send/views/RecipientView.qml
@@ -67,7 +67,15 @@ Loader {
             }
             case Helpers.RecipientAddressObjectType.Address: {
                 root.addressText = root.selectedRecipient
-                root.item.input.text = root.addressText
+
+                // Resolve before using
+                if (Utils.isValidEns(root.selectedRecipient)) {
+                    d.isPending = true
+                    d.resolveENS(root.selectedRecipient)
+                }
+                else {
+                    root.item.input.text = root.addressText
+                }
                 break
             }
             }
diff --git a/ui/imports/shared/views/chat/MessageView.qml b/ui/imports/shared/views/chat/MessageView.qml
index 3db0b34b4c..e7cbc685f0 100644
--- a/ui/imports/shared/views/chat/MessageView.qml
+++ b/ui/imports/shared/views/chat/MessageView.qml
@@ -733,8 +733,7 @@ Loader {
                 onLinkActivated: {
                     if (link.startsWith(Constants.sendViaChatPrefix)) {
                         const addressOrEns = link.replace(Constants.sendViaChatPrefix, "");
-                        // TODO:: will be removed in the PRs to follow
-                        Global.displayToastMessage(qsTr("TODO:: Send Via 1-1"), addressOrEns, "", false, 0, "")
+                        Global.openSendModal(addressOrEns)
                         return
                     }
                     if (link.startsWith('//')) {