diff --git a/SignalMessaging/utils/ThreadUtil.swift b/SignalMessaging/utils/ThreadUtil.swift
index b2f388173f..f0d4b718e1 100644
--- a/SignalMessaging/utils/ThreadUtil.swift
+++ b/SignalMessaging/utils/ThreadUtil.swift
@@ -158,23 +158,34 @@ extension TSThread {
 
         let senderAddress: SignalServiceAddress
         let message: TSMessage?
+        let recipients: [INPerson]?
         switch context {
         case .outgoingMessage(let outgoingMessage):
             senderAddress = localAddress
             message = outgoingMessage
+
+            // For 1:1 outgoing messages, we must populate the recipient of the message,
+            // otherwise sharing suggestions won't be populated correctly.
+            if !isGroupThread {
+                recipients = outgoingMessage.recipientAddresses().map { inPersonForRecipient($0, transaction: transaction) }
+            } else {
+                recipients = nil
+            }
         case .incomingMessage(let incomingMessage):
             senderAddress = incomingMessage.authorAddress
             message = incomingMessage
+            recipients = nil
         case .senderAddress(let address):
             senderAddress = address
             message = nil
+            recipients = nil
         }
 
         let threadName = contactsManager.displayName(for: self, transaction: transaction)
         let inSender = inPersonForRecipient(senderAddress, transaction: transaction)
 
         let sendMessageIntent = INSendMessageIntent(
-            recipients: nil,
+            recipients: recipients,
             outgoingMessageType: .outgoingMessageText,
             content: nil,
             speakableGroupName: isGroupThread ? INSpeakableString(spokenPhrase: threadName) : nil,
diff --git a/SignalServiceKit/src/Util/FeatureFlags.swift b/SignalServiceKit/src/Util/FeatureFlags.swift
index d68da2711e..16cf1a6757 100644
--- a/SignalServiceKit/src/Util/FeatureFlags.swift
+++ b/SignalServiceKit/src/Util/FeatureFlags.swift
@@ -19,7 +19,7 @@ extension FeatureBuild {
     }
 }
 
-private let build: FeatureBuild = OWSIsDebugBuild() ? .dev : .qa
+private let build: FeatureBuild = OWSIsDebugBuild() ? .dev : .beta
 
 // MARK: -