1 files changed, 5 insertions, 2 deletions
diff --git a/main/src/ui/conversation_summary/message_populator.vala b/main/src/ui/conversation_summary/message_populator.vala
index 2c3eccd2..f6d55a92 100644
--- a/main/src/ui/conversation_summary/message_populator.vala
+++ b/main/src/ui/conversation_summary/message_populator.vala
@@ -47,14 +47,17 @@ public class MessagePopulator : Object {
         if (!conversation.equals(current_conversation)) return;
 
         Plugins.MessageDisplayProvider? best_provider = null;
-        int priority = -1;
+        double priority = -1;
         Application app = GLib.Application.get_default() as Application;
         foreach (Plugins.MessageDisplayProvider provider in app.plugin_registry.message_displays) {
             if (provider.can_display(message) && provider.priority > priority) {
                 best_provider = provider;
+                priority = provider.priority;
             }
         }
-        Plugins.MetaConversationItem meta_item = best_provider.get_item(message, conversation);
+        Plugins.MetaConversationItem? meta_item = best_provider.get_item(message, conversation);
+        if (meta_item == null) return;
+
         meta_item.mark = message.marked;
         message.notify["marked"].connect(() => {
             meta_item.mark = message.marked;