diff --git a/submodules/DrawingUI/Sources/DrawingLinkEntityView.swift b/submodules/DrawingUI/Sources/DrawingLinkEntityView.swift
index 22d81cd41d..19eeba7632 100644
--- a/submodules/DrawingUI/Sources/DrawingLinkEntityView.swift
+++ b/submodules/DrawingUI/Sources/DrawingLinkEntityView.swift
@@ -209,7 +209,7 @@ public final class DrawingLinkEntityView: DrawingEntityView, UITextViewDelegate
         if !self.linkEntity.name.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
             string = self.linkEntity.name.trimmingCharacters(in: .whitespacesAndNewlines).uppercased()
         } else {
-            string = self.linkEntity.url.uppercased()
+            string = self.linkEntity.url.uppercased().replacingOccurrences(of: "http://", with: "").replacingOccurrences(of: "https://", with: "")
         }
         let text = NSMutableAttributedString(string: string)
         let range = NSMakeRange(0, text.length)
diff --git a/submodules/PasswordSetupUI/Sources/TwoFactorAuthDataInputScreen.swift b/submodules/PasswordSetupUI/Sources/TwoFactorAuthDataInputScreen.swift
index 539b78af18..9ec039326d 100644
--- a/submodules/PasswordSetupUI/Sources/TwoFactorAuthDataInputScreen.swift
+++ b/submodules/PasswordSetupUI/Sources/TwoFactorAuthDataInputScreen.swift
@@ -1104,7 +1104,7 @@ private final class TwoFactorDataInputTextNode: ASDisplayNode, UITextFieldDelega
             self.hideButtonNode.isHidden = confirmation
         case .email:
             self.inputNode.textField.keyboardType = .emailAddress
-            self.inputNode.textField.returnKeyType = .done
+            self.inputNode.textField.returnKeyType = .next
             self.hideButtonNode.isHidden = true
             
             if #available(iOS 12.0, *) {
@@ -1134,7 +1134,7 @@ private final class TwoFactorDataInputTextNode: ASDisplayNode, UITextFieldDelega
             }
         case .hint:
             self.inputNode.textField.keyboardType = .asciiCapable
-            self.inputNode.textField.returnKeyType = .done
+            self.inputNode.textField.returnKeyType = .next
             self.hideButtonNode.isHidden = true
             
             self.inputNode.textField.autocorrectionType = .no
diff --git a/submodules/TelegramUI/Components/MediaEditorScreen/Sources/CreateLinkScreen.swift b/submodules/TelegramUI/Components/MediaEditorScreen/Sources/CreateLinkScreen.swift
index b8afdb5081..8b64da17ae 100644
--- a/submodules/TelegramUI/Components/MediaEditorScreen/Sources/CreateLinkScreen.swift
+++ b/submodules/TelegramUI/Components/MediaEditorScreen/Sources/CreateLinkScreen.swift
@@ -466,14 +466,21 @@ private final class CreateLinkSheetComponent: CombinedComponent {
             let text = !self.name.isEmpty ? self.name : self.link
             
             var effectiveMedia: TelegramMediaWebpage?
-            if let webpage = self.webpage, case .Loaded = webpage.content, !self.dismissed {
+            var webpageHasLargeMedia = false
+            if let webpage = self.webpage, case let .Loaded(content) = webpage.content, !self.dismissed {
                 effectiveMedia = webpage
+                
+                if let isMediaLargeByDefault = content.isMediaLargeByDefault, isMediaLargeByDefault {
+                    webpageHasLargeMedia = true
+                } else {
+                    webpageHasLargeMedia = true
+                }
             }
             
             var attributes: [MessageAttribute] = []
             attributes.append(TextEntitiesMessageAttribute(entities: [.init(range: 0 ..< (text as NSString).length, type: .Url)]))
             if !self.dismissed {
-                attributes.append(WebpagePreviewMessageAttribute(leadingPreview: !self.positionBelowText, forceLargeMedia: self.largeMedia, isManuallyAdded: false, isSafe: true))
+                attributes.append(WebpagePreviewMessageAttribute(leadingPreview: !self.positionBelowText, forceLargeMedia: self.largeMedia ?? webpageHasLargeMedia, isManuallyAdded: false, isSafe: true))
             }
             
             let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt64Value(1))