From 9242f971fd626cf9a0114543c3d5d2dd81aa2e12 Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Thu, 19 Nov 2020 16:28:30 +1100
Subject: [PATCH] Fix timestamp handling

---
 SessionMessagingKit/Sending & Receiving/MessageReceiver.swift   | 1 +
 SignalUtilitiesKit/Messaging/TSIncomingMessage+Conversion.swift | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/SessionMessagingKit/Sending & Receiving/MessageReceiver.swift b/SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
index 74cf8dae9..2f9b3b4cc 100644
--- a/SessionMessagingKit/Sending & Receiving/MessageReceiver.swift	
+++ b/SessionMessagingKit/Sending & Receiving/MessageReceiver.swift	
@@ -85,6 +85,7 @@ internal enum MessageReceiver {
         if let message = message {
             message.sender = sender
             message.recipient = Configuration.shared.storage.getUserPublicKey()
+            message.sentTimestamp = envelope.timestamp
             message.receivedTimestamp = NSDate.millisecondTimestamp()
             message.groupPublicKey = groupPublicKey
             message.openGroupServerMessageID = messageServerID
diff --git a/SignalUtilitiesKit/Messaging/TSIncomingMessage+Conversion.swift b/SignalUtilitiesKit/Messaging/TSIncomingMessage+Conversion.swift
index bd21269d6..b337d210b 100644
--- a/SignalUtilitiesKit/Messaging/TSIncomingMessage+Conversion.swift
+++ b/SignalUtilitiesKit/Messaging/TSIncomingMessage+Conversion.swift
@@ -4,7 +4,7 @@ public extension TSIncomingMessage {
     static func from(_ visibleMessage: VisibleMessage, associatedWith thread: TSThread, using transaction: YapDatabaseReadWriteTransaction) -> TSIncomingMessage {
         let sender = visibleMessage.sender!
         let result = TSIncomingMessage(
-            timestamp: visibleMessage.receivedTimestamp!,
+            timestamp: visibleMessage.sentTimestamp!,
             in: thread,
             authorId: sender,
             sourceDeviceId: 1,