diff --git a/ui/app/AppLayouts/Profile/views/MessagingView.qml b/ui/app/AppLayouts/Profile/views/MessagingView.qml
index 3d17bb99cf..d29f18830f 100644
--- a/ui/app/AppLayouts/Profile/views/MessagingView.qml
+++ b/ui/app/AppLayouts/Profile/views/MessagingView.qml
@@ -361,7 +361,6 @@ SettingsContentBase {
                                 filename = "github"; break;
                             case "medium":
                                 filename = "medium"; break;
-                            case "tenor gifs":
                             case "tenor gifs subdomain":
                                 filename = "tenor"; break;
                             case "giphy gifs":
diff --git a/ui/imports/shared/views/chat/LinksMessageView.qml b/ui/imports/shared/views/chat/LinksMessageView.qml
index 76aef87f80..aa614dcacb 100644
--- a/ui/imports/shared/views/chat/LinksMessageView.qml
+++ b/ui/imports/shared/views/chat/LinksMessageView.qml
@@ -261,7 +261,8 @@ Column {
                 container: root.container
                 source: linkData.thumbnailUrl
                 visible: linkData.thumbnailUrl.length
-                imageWidth: 300
+                readonly property int previewWidth: parseInt(linkData.width)
+                imageWidth: Math.min(300, previewWidth > 0 ? previewWidth : 300)
                 isCurrentUser: root.isCurrentUser
                 anchors.horizontalCenter: parent.horizontalCenter
                 anchors.top: parent.top
diff --git a/vendor/status-go b/vendor/status-go
index 846029692c..bcdb14bd48 160000
--- a/vendor/status-go
+++ b/vendor/status-go
@@ -1 +1 @@
-Subproject commit 846029692c8a2ec5f9adb1b6781498f265c44b75
+Subproject commit bcdb14bd4890aab8f803cf0b8c1ecd702f4228a4