Matrix: merge system messages

1 files changed, 6 insertions, 1 deletions

diff --git a/src/QuickMedia.cpp b/src/QuickMedia.cpp
index 286e766..c44b8c4 100644
--- a/src/QuickMedia.cpp
+++ b/src/QuickMedia.cpp
@@ -5422,13 +5422,18 @@ namespace QuickMedia {
 
         tabs[MESSAGES_TAB_INDEX].body->body_item_merge_handler = [](BodyItem *prev_item, BodyItem *this_item) {
             Message *message = static_cast<Message*>(this_item->userdata);
-            if(!message || !prev_item || !prev_item->userdata || is_system_message_type(message->type))
+            if(!message || !prev_item || !prev_item->userdata)
                 return false;
 
             if(is_visual_media_message_type(message->type) && !this_item->thumbnail_url.empty())
                 return false;
 
             Message *prev_message = static_cast<Message*>(prev_item->userdata);
+            if(is_system_message_type(prev_message->type) && is_system_message_type(message->type))
+                return true;
+            else if(is_system_message_type(message->type))
+                return false;
+
             if(is_visual_media_message_type(prev_message->type) && !prev_item->thumbnail_url.empty())
                 return false;