diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
index ce7ca7808d..a2c298a23e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
@@ -828,7 +828,7 @@ class ConversationFragment :
       .doOnSuccess { state ->
         adapter.setMessageRequestIsAccepted(state.meta.messageRequestData.isMessageRequestAccepted)
         SignalLocalMetrics.ConversationOpen.onDataLoaded()
-        conversationItemDecorations.setFirstUnreadState(state.meta.lastSeen)
+        conversationItemDecorations.setFirstUnreadState(state.meta.unreadCount, state.meta.lastSeen)
         colorizer.onGroupMembershipChanged(state.meta.groupMemberAcis)
       }
       .observeOn(AndroidSchedulers.mainThread())
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations.kt
index a02d780588..edfef61e93 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations.kt
@@ -94,9 +94,9 @@ class ConversationItemDecorations(hasWallpaper: Boolean = false, private val sch
   }
 
   /** Must be called before first setting of [currentItems] */
-  fun setFirstUnreadState(lastSeenTimestamp: Long) {
+  fun setFirstUnreadState(unreadCount: Int, lastSeenTimestamp: Long) {
     if (unreadState == UnreadState.None && lastSeenTimestamp > 0) {
-      unreadState = UnreadState.InitialUnreadState(lastSeenTimestamp = lastSeenTimestamp)
+      unreadState = UnreadState.InitialUnreadState(unreadCount = unreadCount, lastSeenTimestamp = lastSeenTimestamp)
     }
   }
 
@@ -114,11 +114,12 @@ class ConversationItemDecorations(hasWallpaper: Boolean = false, private val sch
     if (state is UnreadState.InitialUnreadState) {
       val firstUnread = items
         .filterIsInstance<ConversationMessageElement>()
-        .lastOrNull { it.timestamp() > state.lastSeenTimestamp }
+        .takeWhile { it.timestamp() > state.lastSeenTimestamp }
+        .lastOrNull()
 
       if (firstUnread != null) {
         unreadState = UnreadState.CompleteUnreadState(
-          unreadCount = items.indexOf(firstUnread as ConversationElement?) + 1,
+          unreadCount = state.unreadCount,
           firstUnreadTimestamp = firstUnread.timestamp()
         )
       }
@@ -204,7 +205,7 @@ class ConversationItemDecorations(hasWallpaper: Boolean = false, private val sch
     return if (scheduleMessageMode) {
       (conversationMessage.messageRecord as MediaMmsMessageRecord).scheduledDate
     } else {
-      conversationMessage.conversationTimestamp
+      conversationMessage.messageRecord.dateReceived
     }
   }
 
@@ -275,7 +276,7 @@ class ConversationItemDecorations(hasWallpaper: Boolean = false, private val sch
     object None : UnreadState()
 
     /** On first load of data, there is at least 1 unread message but we don't know the 'position' in the list yet */
-    data class InitialUnreadState(val lastSeenTimestamp: Long) : UnreadState()
+    data class InitialUnreadState(val unreadCount: Int, val lastSeenTimestamp: Long) : UnreadState()
 
     /** We have at least one unread and know the timestamp of the first unread message and thus 'position' for the header */
     data class CompleteUnreadState(val unreadCount: Int, val firstUnreadTimestamp: Long? = null) : UnreadState()