diff --git a/SignalServiceKit/src/Messages/Interactions/TSMessage.m b/SignalServiceKit/src/Messages/Interactions/TSMessage.m
index 345803785..562d37057 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSMessage.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSMessage.m
@@ -350,21 +350,21 @@ static const NSUInteger OWSMessageSchemaVersion = 4;
 
     if (attachmentDescription.length > 0 && bodyDescription.length > 0) {
         // Attachment with caption.
-        if ([CurrentAppContext() isRTL]) {
-            return [[bodyDescription stringByAppendingString:@": "] stringByAppendingString:attachmentDescription];
-        } else {
+//        if ([CurrentAppContext() isRTL]) {
+//            return [[bodyDescription stringByAppendingString:@": "] stringByAppendingString:attachmentDescription];
+//        } else {
             return [[attachmentDescription stringByAppendingString:@": "] stringByAppendingString:bodyDescription];
-        }
+//        }
     } else if (bodyDescription.length > 0) {
         return bodyDescription;
     } else if (attachmentDescription.length > 0) {
         return attachmentDescription;
     } else if (self.contactShare) {
-        if (CurrentAppContext().isRTL) {
-            return [self.contactShare.name.displayName stringByAppendingString:@" 👤"];
-        } else {
+//        if (CurrentAppContext().isRTL) {
+//            return [self.contactShare.name.displayName stringByAppendingString:@" 👤"];
+//        } else {
             return [@"👤 " stringByAppendingString:self.contactShare.name.displayName];
-        }
+//        }
     } else {
 //        OWSFailDebug(@"message has neither body nor attachment.");
         // TODO: We should do better here.
diff --git a/SignalServiceKit/src/Messages/OWSMessageManager.m b/SignalServiceKit/src/Messages/OWSMessageManager.m
index 026195814..b6ad356a1 100644
--- a/SignalServiceKit/src/Messages/OWSMessageManager.m
+++ b/SignalServiceKit/src/Messages/OWSMessageManager.m
@@ -1399,14 +1399,14 @@ NS_ASSUME_NONNULL_BEGIN
 
     // The envelope source is set during UD decryption.
 
-    if ([ECKeyPair isValidHexEncodedPublicKeyWithCandidate:envelope.source]) {
+    if ([ECKeyPair isValidHexEncodedPublicKeyWithCandidate:envelope.source] && dataMessage.publicChatInfo == nil) { // Handled in LokiPublicChatPoller for open group messages
         dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
         [[LKAPI getDestinationsFor:envelope.source inTransaction:transaction].ensureOn(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^() {
             dispatch_semaphore_signal(semaphore);
         }).catchOn(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^(NSError *error) {
             dispatch_semaphore_signal(semaphore);
         }) retainUntilComplete];
-        dispatch_semaphore_wait(semaphore, dispatch_time(DISPATCH_TIME_NOW, 10 * NSEC_PER_SEC));
+        dispatch_semaphore_wait(semaphore, dispatch_time(DISPATCH_TIME_NOW, 4 * NSEC_PER_SEC));
     }
 
     if (groupId.length > 0) {