2 files changed, 2 insertions, 2 deletions
diff --git a/main/src/ui/conversation_summary/conversation_item_skeleton.vala b/main/src/ui/conversation_summary/conversation_item_skeleton.vala
index 1eb76840..03114227 100644
--- a/main/src/ui/conversation_summary/conversation_item_skeleton.vala
+++ b/main/src/ui/conversation_summary/conversation_item_skeleton.vala
@@ -39,7 +39,7 @@ public class ConversationItemSkeleton : Grid {
         } else {
             set_title_widget(widget);
         }
-        item.notify["mark"].connect_after(update_received);
+        item.notify["mark"].connect_after(() => { Idle.add(() => { update_received(); return false; }); });
         update_received();
     }
 
diff --git a/main/src/ui/conversation_summary/conversation_view.vala b/main/src/ui/conversation_summary/conversation_view.vala
index 3f5a85b6..dcd24652 100644
--- a/main/src/ui/conversation_summary/conversation_view.vala
+++ b/main/src/ui/conversation_summary/conversation_view.vala
@@ -98,7 +98,7 @@ public class ConversationView : Box, Plugins.ConversationItemCollection {
                     item.display_time.difference(lower_start_item.display_time) < TimeSpan.MINUTE &&
                     lower_start_item.jid.equals(item.jid) &&
                     lower_start_item.encryption == item.encryption &&
-                    item.mark != Message.Marked.WONTSEND) {
+                    (item.mark == Message.Marked.WONTSEND) == (lower_start_item.mark == Message.Marked.WONTSEND)) {
                 lower_skeleton.add_meta_item(item);
                 force_alloc_width(lower_skeleton, main.get_allocated_width());
                 item_item_skeletons[item] = lower_skeleton;