From 7786956b11c92c76e2c223b148bee77d584129e0 Mon Sep 17 00:00:00 2001
From: Clark <clark@signal.org>
Date: Fri, 23 Jun 2023 15:51:30 -0400
Subject: [PATCH] Fix conversation date header weirdness with edited messages.

---
 .../securesms/conversation/ConversationAdapter.java             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java
index 198d30ee13..f5d92e025a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java
@@ -338,7 +338,7 @@ public class ConversationAdapter
     if (scheduledMessagesMode) {
       calendar.setTimeInMillis(((MediaMmsMessageRecord) conversationMessage.getMessageRecord()).getScheduledDate());
     } else {
-      calendar.setTimeInMillis(conversationMessage.getMessageRecord().getDateSent());
+      calendar.setTimeInMillis(conversationMessage.getConversationTimestamp());
     }
     return calendar.get(Calendar.YEAR) * 1000L + calendar.get(Calendar.DAY_OF_YEAR);
   }