diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
index 5294007ff0..b765923646 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
@@ -1337,7 +1337,7 @@ const CGFloat kMaxIPadTextViewHeight = 142;
         return;
     }
 
-    NSURL *previewUrl = [self.linkPreviewManager findFirstValidURLInSearchString:self.inputTextView.text];
+    NSURL *previewUrl = [self.linkPreviewManager findFirstValidUrlInSearchString:self.inputTextView.text];
     if (!previewUrl.absoluteString.length) {
         [self clearLinkPreviewStateAndView];
         return;
@@ -1355,7 +1355,7 @@ const CGFloat kMaxIPadTextViewHeight = 142;
     [self ensureLinkPreviewViewWithState:[LinkPreviewLoading new]];
 
     __weak ConversationInputToolbar *weakSelf = self;
-    [self.linkPreviewManager fetchLinkPreviewForURL:previewUrl]
+    [self.linkPreviewManager fetchLinkPreviewForUrl:previewUrl]
         .then(^(OWSLinkPreviewDraft *linkPreviewDraft) {
             ConversationInputToolbar *_Nullable strongSelf = weakSelf;
             if (!strongSelf) {
@@ -1365,14 +1365,13 @@ const CGFloat kMaxIPadTextViewHeight = 142;
                 // Obsolete callback.
                 return;
             }
-            inputLinkPreview.previewUrl = linkPreviewDraft.url;
             inputLinkPreview.linkPreviewDraft = linkPreviewDraft;
             LinkPreviewDraft *viewState = [[LinkPreviewDraft alloc] initWithLinkPreviewDraft:linkPreviewDraft];
             [strongSelf ensureLinkPreviewViewWithState:viewState];
         })
         .catch(^(id error) {
             // The link preview could not be loaded.
-            [weakSelf clearLinkPreviewStateAndView];
+            [weakSelf clearLinkPreviewView];
         });
 }
 
diff --git a/SignalMessaging/ViewControllers/Stickers/StickerSharingViewController.swift b/SignalMessaging/ViewControllers/Stickers/StickerSharingViewController.swift
index be0e91e6c0..9742d7923b 100644
--- a/SignalMessaging/ViewControllers/Stickers/StickerSharingViewController.swift
+++ b/SignalMessaging/ViewControllers/Stickers/StickerSharingViewController.swift
@@ -56,7 +56,7 @@ public class StickerSharingViewController: SelectThreadViewController {
         // Try to include a link preview of the sticker pack.
         firstly { () -> Promise<OWSLinkPreviewDraft> in
             guard let url = URL(string: packUrl) else {
-                throw OWSAssertionError("Invalid URL")
+                throw OWSAssertionError("Invalid url")
             }
             return linkPreviewManager.fetchLinkPreview(for: url)
 
diff --git a/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift b/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift
index 34d7406b55..91d3227761 100644
--- a/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift
+++ b/SignalServiceKit/src/Messages/Interactions/OWSLinkPreview.swift
@@ -121,13 +121,13 @@ public class OWSLinkPreview: MTLModel {
         }
         let urlString = previewProto.url
 
-        guard let url = URL(string: urlString), url.isPermittedLinkPreviewURL else {
-            Logger.error("Could not parse preview URL.")
+        guard let url = URL(string: urlString), url.isPermittedLinkPreviewUrl else {
+            Logger.error("Could not parse preview url.")
             throw LinkPreviewError.invalidPreview
         }
 
         guard let body = body, body.contains(urlString) else {
-            Logger.error("URL not present in body")
+            Logger.error("Url not present in body")
             throw LinkPreviewError.invalidPreview
         }
 
@@ -258,9 +258,9 @@ public class OWSLinkPreviewManager: NSObject {
 
     // MARK: - Public
 
-    @objc(findFirstValidURLInSearchString:)
-    public func findFirstValidURL(in searchString: String) -> URL? {
-        guard areLinkPreviewsEnabled() else { return nil }
+    @objc(findFirstValidUrlInSearchString:)
+    public func findFirstValidUrl(in searchString: String) -> URL? {
+        guard areLinkPreviewsEnabledWithSneakyTransaction() else { return nil }
         guard let detector = try? NSDataDetector(types: NSTextCheckingResult.CheckingType.link.rawValue) else {
             owsFailDebug("Could not create NSDataDetector")
             return nil
@@ -272,18 +272,18 @@ public class OWSLinkPreviewManager: NSObject {
             range: NSRange(searchString.startIndex..<searchString.endIndex, in: searchString))
 
         return allMatches
-            .first(where: { $0.url?.isPermittedLinkPreviewURL == true })?
+            .first(where: { $0.url?.isPermittedLinkPreviewUrl == true })?
             .url
     }
 
-    @objc(fetchLinkPreviewForURL:)
+    @objc(fetchLinkPreviewForUrl:)
     public func fetchLinkPreview(for url: URL) -> AnyPromise {
         let promise: Promise<OWSLinkPreviewDraft> = fetchLinkPreview(for: url)
         return AnyPromise(promise)
     }
 
     public func fetchLinkPreview(for url: URL) -> Promise<OWSLinkPreviewDraft> {
-        guard areLinkPreviewsEnabled() else {
+        guard areLinkPreviewsEnabledWithSneakyTransaction() else {
             return Promise(error: LinkPreviewError.featureDisabled)
         }
 
@@ -317,12 +317,12 @@ public class OWSLinkPreviewManager: NSObject {
             let title = opengraph.title
             let draft = OWSLinkPreviewDraft(url: url, title: title)
 
-            guard let imageURLString = opengraph.imageURL, let imageURL = URL(string: imageURLString) else {
+            guard let imageUrlString = opengraph.imageUrl, let imageUrl = URL(string: imageUrlString) else {
                 return Promise.value((draft, nil))
             }
 
             return firstly(on: Self.workQueue) { () -> Promise<Data> in
-                self.fetchImageResource(from: imageURL)
+                self.fetchImageResource(from: imageUrl)
             }.map(on: Self.workQueue) { data -> (OWSLinkPreviewDraft, Data?) in
                 return (draft, data)
             }.recover(on: Self.workQueue) { _ -> Promise<(OWSLinkPreviewDraft, Data?)> in
@@ -340,29 +340,9 @@ public class OWSLinkPreviewManager: NSObject {
 
     }
 
-    // MARK: - Private, URL Parsing
-
-    private func parseFirstValidURL(in searchString: String) -> URL? {
-
-        guard let detector = try? NSDataDetector(types: NSTextCheckingResult.CheckingType.link.rawValue) else {
-            owsFailDebug("Could not create NSDataDetector")
-            return nil
-        }
-
-        let allMatches = detector.matches(
-            in: searchString,
-            options: [],
-            range: NSRange(searchString.startIndex..<searchString.endIndex, in: searchString)
-        )
-
-        return allMatches
-            .first(where: { $0.url?.isPermittedLinkPreviewURL == true })?
-            .url
-    }
-
     // MARK: - Private, Utilities
 
-    func areLinkPreviewsEnabled() -> Bool {
+    func areLinkPreviewsEnabledWithSneakyTransaction() -> Bool {
         return databaseStorage.read { transaction in
             SSKPreferences.areLinkPreviewsEnabled(transaction: transaction)
         }
@@ -394,7 +374,7 @@ public class OWSLinkPreviewManager: NSObject {
             }
         }
         sessionManager.setTaskWillPerformHTTPRedirectionBlock { (_, _, _, request) -> URLRequest? in
-            if request.url?.isPermittedLinkPreviewURL == true {
+            if request.url?.isPermittedLinkPreviewUrl == true {
                 return request
             } else {
                 return nil
@@ -440,17 +420,26 @@ public class OWSLinkPreviewManager: NSObject {
                     Logger.warn("Invalid response: \(type(of: task.response)).")
                     throw LinkPreviewError.fetchFailure
                 }
-                guard let imageData = responseObject as? Data,
-                      let image = UIImage(data: imageData) else {
+                guard let rawData = responseObject as? Data,
+                      rawData.count < Self.maxFetchedContentSize else {
+
                     Logger.warn("Response object could not be parsed")
                     throw LinkPreviewError.invalidPreview
                 }
 
+                let imageData = (rawData as NSData).imageData(withPath: nil, mimeType: nil)
+                guard imageData.isValid,
+                      imageData.pixelSize.height > 0,
+                      imageData.pixelSize.width > 0,
+                      let image = UIImage(data: rawData) else {
+                    Logger.warn("Invalid image data")
+                    throw LinkPreviewError.invalidPreview
+                }
+
                 let maxDimension: CGFloat = 1024
-                let imageSize = image.pixelSize()
 
                 let scaledImage: UIImage?
-                if imageSize.height > maxDimension || imageSize.width > maxDimension {
+                if imageData.pixelSize.height > maxDimension || imageData.pixelSize.width > maxDimension {
                     scaledImage = image.resized(withMaxDimensionPixels: 1024)
                 } else {
                     scaledImage = image
@@ -483,7 +472,7 @@ public class OWSLinkPreviewManager: NSObject {
         Logger.verbose("url: \(url)")
 
         guard let stickerPackInfo = StickerPackInfo.parseStickerPackShare(url) else {
-            Logger.error("Could not parse URL.")
+            Logger.error("Could not parse url.")
             return Promise(error: LinkPreviewError.invalidPreview)
         }
 
@@ -537,13 +526,13 @@ fileprivate extension URL {
             return nil
         }
         guard let mimeType = MIMETypeUtil.mimeType(forFileExtension: pathExtension) else {
-            Logger.error("Image URL has unknown content type: \(pathExtension).")
+            Logger.error("Image url has unknown content type: \(pathExtension).")
             return nil
         }
         return mimeType
     }
 
-    var isPermittedLinkPreviewURL: Bool {
+    var isPermittedLinkPreviewUrl: Bool {
         guard let scheme = scheme?.lowercased(), scheme.count > 0 else { return false }
         guard let hostname = host, hostname.count > 0 else { return false }
 
@@ -589,7 +578,7 @@ fileprivate extension OWSLinkPreviewManager {
             return nil
         }
         guard url.path.count > 1 else {
-            // URL must have non-empty path.
+            // Url must have non-empty path.
             return nil
         }
         return domain
diff --git a/SignalServiceKit/src/Network/OpenGraphContent.swift b/SignalServiceKit/src/Network/OpenGraphContent.swift
index 3fb2a6463d..975ed34ac8 100644
--- a/SignalServiceKit/src/Network/OpenGraphContent.swift
+++ b/SignalServiceKit/src/Network/OpenGraphContent.swift
@@ -6,12 +6,12 @@ import Foundation
 
 struct OpenGraphContent {
     let title: String?
-    let imageURL: String?
+    let imageUrl: String?
 
     init(parsing rawHTML: String) {
         let parsedTags = Self.parseOGTags(rawHTML: rawHTML)
         self.title = parsedTags["title"]
-        self.imageURL = parsedTags["image"]
+        self.imageUrl = parsedTags["image"]
     }
 }
 
@@ -67,7 +67,7 @@ private extension NSRegularExpression {
         return allMatches.map { (match) -> [String] in
             (0..<match.numberOfRanges)
                 .compactMap { rangeIdx in Range(match.range(at: rangeIdx), in: searchString) }
-                .compactMap { range in String(searchString[range]) }
+                .map { range in String(searchString[range]) }
         }
     }