diff --git a/Signal/src/Loki/LokiGroupChatPoller.swift b/Signal/src/Loki/LokiGroupChatPoller.swift
index 080644cde..4cbd1d19f 100644
--- a/Signal/src/Loki/LokiGroupChatPoller.swift
+++ b/Signal/src/Loki/LokiGroupChatPoller.swift
@@ -9,6 +9,9 @@ public final class LokiGroupChatPoller : NSObject {
     private let pollForNewMessagesInterval: TimeInterval = 4
     private let pollForDeletedMessagesInterval: TimeInterval = 32 * 60
     
+    private let storage = OWSPrimaryStorage.shared()
+    private let ourHexEncodedPubKey = OWSIdentityManager.shared().identityKeyPair()!.hexEncodedPublicKey
+    
     @objc(initForGroup:)
     public init(for group: LokiGroupChat) {
         self.group = group
@@ -31,32 +34,71 @@ public final class LokiGroupChatPoller : NSObject {
     
     private func pollForNewMessages() {
         let group = self.group
-        let _ = LokiGroupChatAPI.getMessages(for: group.serverID, on: group.server).done { messages in
+        let _ = LokiGroupChatAPI.getMessages(for: group.serverID, on: group.server).done { [weak self] messages in
+            guard let self = self else { return }
             messages.reversed().forEach { message in
                 let senderHexEncodedPublicKey = message.hexEncodedPublicKey
-                let endIndex = senderHexEncodedPublicKey.endIndex
-                let cutoffIndex = senderHexEncodedPublicKey.index(endIndex, offsetBy: -8)
-                let senderDisplayName = "\(message.displayName) (...\(senderHexEncodedPublicKey[cutoffIndex..<endIndex]))"
-                let id = group.id.data(using: String.Encoding.utf8)!
-                let x1 = SSKProtoGroupContext.builder(id: id, type: .deliver)
-                x1.setName(group.displayName)
-                let x2 = SSKProtoDataMessage.builder()
-                x2.setTimestamp(message.timestamp)
-                x2.setGroup(try! x1.build())
-                x2.setBody(message.body)
-                let x3 = SSKProtoContent.builder()
-                x3.setDataMessage(try! x2.build())
-                let x4 = SSKProtoEnvelope.builder(type: .ciphertext, timestamp: message.timestamp)
-                x4.setSource(senderDisplayName)
-                x4.setSourceDevice(OWSDevicePrimaryDeviceId)
-                x4.setContent(try! x3.build().serializedData())
-                OWSPrimaryStorage.shared().dbReadWriteConnection.readWrite { transaction in
-                    SSKEnvironment.shared.messageManager.throws_processEnvelope(try! x4.build(), plaintextData: try! x3.build().serializedData(), wasReceivedByUD: false, transaction: transaction)
+                if (senderHexEncodedPublicKey != self.ourHexEncodedPubKey) {
+                    self.handleIncomingMessage(message, group: group);
+                } else {
+                    self.handleOutgoingMessage(message, group: group)
                 }
             }
         }
     }
     
+    private func handleOutgoingMessage(_ message: LokiGroupMessage, group: LokiGroupChat) {
+        // Any Outgoing message should have a message server id mapped to it
+        guard let messageServerID = message.serverID else { return }
+        
+        var hasMessage = false
+        storage.newDatabaseConnection().read { transaction in
+            let id = self.storage.getIDForMessage(withServerID: UInt(messageServerID), in: transaction);
+            hasMessage = id != nil
+        }
+        
+        // Check if we already have a message for this server message
+        guard !hasMessage, let groupID = group.id.data(using: .utf8) else { return }
+        
+        // Get the thread
+        let groupThread = TSGroupThread.getOrCreateThread(withGroupId: groupID)
+        
+        // Save the message
+        let message = TSOutgoingMessage(outgoingMessageWithTimestamp: message.timestamp, in: groupThread, messageBody: message.body, attachmentIds: [], expiresInSeconds: 0, expireStartedAt: 0, isVoiceMessage: false, groupMetaMessage: .deliver, quotedMessage: nil, contactShare: nil, linkPreview: nil)
+        storage.newDatabaseConnection().readWrite { transaction in
+            message.update(withSentRecipient: group.server, wasSentByUD: false, transaction: transaction)
+            message.save(with: transaction)
+            guard let messageID = message.uniqueId else {
+                owsFailDebug("[Loki] Outgoing public chat message should have a unique id set")
+                return
+            }
+            self.storage.setIDForMessageWithServerID(UInt(messageServerID), to: messageID, in: transaction)
+        }
+    }
+    
+    private func handleIncomingMessage(_ message: LokiGroupMessage, group: LokiGroupChat) {
+        let senderHexEncodedPublicKey = message.hexEncodedPublicKey
+        let endIndex = senderHexEncodedPublicKey.endIndex
+        let cutoffIndex = senderHexEncodedPublicKey.index(endIndex, offsetBy: -8)
+        let senderDisplayName = "\(message.displayName) (...\(senderHexEncodedPublicKey[cutoffIndex..<endIndex]))"
+        let id = group.id.data(using: String.Encoding.utf8)!
+        let x1 = SSKProtoGroupContext.builder(id: id, type: .deliver)
+        x1.setName(group.displayName)
+        let x2 = SSKProtoDataMessage.builder()
+        x2.setTimestamp(message.timestamp)
+        x2.setGroup(try! x1.build())
+        x2.setBody(message.body)
+        let x3 = SSKProtoContent.builder()
+        x3.setDataMessage(try! x2.build())
+        let x4 = SSKProtoEnvelope.builder(type: .ciphertext, timestamp: message.timestamp)
+        x4.setSource(senderDisplayName)
+        x4.setSourceDevice(OWSDevicePrimaryDeviceId)
+        x4.setContent(try! x3.build().serializedData())
+        OWSPrimaryStorage.shared().dbReadWriteConnection.readWrite { transaction in
+            SSKEnvironment.shared.messageManager.throws_processEnvelope(try! x4.build(), plaintextData: try! x3.build().serializedData(), wasReceivedByUD: false, transaction: transaction)
+        }
+    }
+    
     private func pollForDeletedMessages() {
         let group = self.group
         let _ = LokiGroupChatAPI.getDeletedMessageServerIDs(for: group.serverID, on: group.server).done { deletedMessageServerIDs in
diff --git a/SignalServiceKit/src/Loki/API/LokiGroupChatAPI.swift b/SignalServiceKit/src/Loki/API/LokiGroupChatAPI.swift
index bd7ca5a9c..ea701bb3b 100644
--- a/SignalServiceKit/src/Loki/API/LokiGroupChatAPI.swift
+++ b/SignalServiceKit/src/Loki/API/LokiGroupChatAPI.swift
@@ -145,7 +145,6 @@ public final class LokiGroupChatAPI : NSObject {
                         print("[Loki] Couldn't parse message for group chat with ID: \(group) on server: \(server) from: \(message).")
                         return nil
                 }
-                guard hexEncodedPublicKey != userHexEncodedPublicKey else { return nil }
                 let lastMessageServerID = getLastMessageServerID(for: group, on: server)
                 let firstMessageServerID = getFirstMessageServerID(for: group, on: server)
                 if serverID > (lastMessageServerID ?? 0) { setLastMessageServerID(for: group, on: server, to: serverID) }
diff --git a/SignalServiceKit/src/Loki/Crypto/OWSPrimaryStorage+Loki.h b/SignalServiceKit/src/Loki/Crypto/OWSPrimaryStorage+Loki.h
index 53a9a1ba4..061732d35 100644
--- a/SignalServiceKit/src/Loki/Crypto/OWSPrimaryStorage+Loki.h
+++ b/SignalServiceKit/src/Loki/Crypto/OWSPrimaryStorage+Loki.h
@@ -96,7 +96,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)setLastMessageHashForServiceNode:(NSString *)serviceNode hash:(NSString *)hash expiresAt:(u_int64_t)expiresAt transaction:(YapDatabaseReadWriteTransaction *)transaction NS_SWIFT_NAME(setLastMessageHash(forServiceNode:hash:expiresAt:transaction:));
 
 - (void)setIDForMessageWithServerID:(NSUInteger)serverID to:(NSString *)messageID in:(YapDatabaseReadWriteTransaction *)transaction;
-- (NSString *)getIDForMessageWithServerID:(NSUInteger)serverID in:(YapDatabaseReadTransaction *)transaction;
+- (NSString *_Nullable)getIDForMessageWithServerID:(NSUInteger)serverID in:(YapDatabaseReadTransaction *)transaction;
 
 @end
 
diff --git a/SignalServiceKit/src/Loki/Crypto/OWSPrimaryStorage+Loki.m b/SignalServiceKit/src/Loki/Crypto/OWSPrimaryStorage+Loki.m
index 17f778a6c..a70240f01 100644
--- a/SignalServiceKit/src/Loki/Crypto/OWSPrimaryStorage+Loki.m
+++ b/SignalServiceKit/src/Loki/Crypto/OWSPrimaryStorage+Loki.m
@@ -168,7 +168,7 @@
     [transaction setObject:messageID forKey:key inCollection:LKMessageIDCollection];
 }
 
-- (NSString *)getIDForMessageWithServerID:(NSUInteger)serverID in:(YapDatabaseReadTransaction *)transaction {
+- (NSString *_Nullable)getIDForMessageWithServerID:(NSUInteger)serverID in:(YapDatabaseReadTransaction *)transaction {
     NSString *key = [NSString stringWithFormat:@"%@", @(serverID)];
     return [transaction objectForKey:key inCollection:LKMessageIDCollection];
 }