diff --git a/SessionMessagingKit/Sending & Receiving/Link Previews/OWSLinkPreview.swift b/SessionMessagingKit/Sending & Receiving/Link Previews/OWSLinkPreview.swift
index a512f12dc..cb0cd1919 100644
--- a/SessionMessagingKit/Sending & Receiving/Link Previews/OWSLinkPreview.swift	
+++ b/SessionMessagingKit/Sending & Receiving/Link Previews/OWSLinkPreview.swift	
@@ -385,10 +385,16 @@ public class OWSLinkPreview: MTLModel {
         var urlMatches: [URLMatchResult] = []
         let matches = detector.matches(in: body, options: [], range: NSRange(location: 0, length: body.count))
         for match in matches {
-            guard let matchURL = match.url else {
-                continue
-            }
-            let urlString = matchURL.absoluteString
+            guard let matchURL = match.url else { continue }
+            
+            // If the URL entered didn't have a scheme it will default to 'http', we want to catch this and
+            // set the scheme to 'https' instead as we don't load previews for 'http' so this will result
+            // in more previews actually getting loaded without forcing the user to enter 'https://' before
+            // every URL they enter
+            let urlString: String = (matchURL.absoluteString == "http://\(body)" ?
+                "https://\(body)" :
+                matchURL.absoluteString
+            )
             if isValidLinkUrl(urlString) {
                 let matchResult = URLMatchResult(urlString: urlString, matchRange: match.range)
                 urlMatches.append(matchResult)
diff --git a/SessionMessagingKit/Sending & Receiving/Mentions/MentionsManager.swift b/SessionMessagingKit/Sending & Receiving/Mentions/MentionsManager.swift
index e1117aa21..9463002b6 100644
--- a/SessionMessagingKit/Sending & Receiving/Mentions/MentionsManager.swift	
+++ b/SessionMessagingKit/Sending & Receiving/Mentions/MentionsManager.swift	
@@ -62,7 +62,15 @@ public final class MentionsManager : NSObject {
             if let groupThread = thread as? TSGroupThread, groupThread.groupModel.groupType == .closedGroup {
                 result = result.union(groupThread.groupModel.groupMemberIds).subtracting([ getUserHexEncodedPublicKey() ])
             } else {
-                guard userPublicKeyCache[threadID] == nil else { return }
+                let hasOnlyCurrentUser: Bool = (
+                    userPublicKeyCache[threadID]?.count == 1 &&
+                    userPublicKeyCache[threadID]?.first == getUserHexEncodedPublicKey()
+                )
+                
+                guard userPublicKeyCache[threadID] == nil || ((thread as? TSGroupThread)?.groupModel.groupType == .openGroup && hasOnlyCurrentUser) else {
+                    return
+                }
+                
                 let interactions = transaction.ext(TSMessageDatabaseViewExtensionName) as! YapDatabaseViewTransaction
                 interactions.enumerateKeysAndObjects(inGroup: threadID) { _, _, object, index, _ in
                     guard let message = object as? TSIncomingMessage, index < userIDScanLimit else { return }