diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt
index c1d58cdf58dd3d2e4e7320d3b5a625df978597c5..aa0234f3b271727a33f0e8d7a8b63dfb680409d1 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt
@@ -280,7 +280,7 @@ class MessageListFragment : ServiceBoundFragment() {
       return list.asReversed().map {
         val date = it.time.atZone(ZoneId.systemDefault()).truncatedTo(ChronoUnit.DAYS)
         val isSameDay = previousDate?.isEqual(date) ?: false
-        val isFollowUp = previous?.sender == it.sender && isSameDay
+        val isFollowUp = previous?.sender == it.sender && previous?.type == it.type && isSameDay
         previous = it
         previousDate = date
         DisplayMessage(