1 files changed, 13 insertions, 2 deletions
diff --git a/main/src/ui/conversation_summary/message_populator.vala b/main/src/ui/conversation_summary/message_populator.vala
index df44a14b..b342306b 100644
--- a/main/src/ui/conversation_summary/message_populator.vala
+++ b/main/src/ui/conversation_summary/message_populator.vala
@@ -10,6 +10,7 @@ public class MessagePopulator : Object {
     private StreamInteractor? stream_interactor;
     private Conversation? current_conversation;
     private Plugins.ConversationItemCollection? item_collection;
+    private HashMap<Plugins.MetaConversationItem, Message> meta_message = new HashMap<Plugins.MetaConversationItem, Message>();
 
     public MessagePopulator(StreamInteractor stream_interactor) {
         this.stream_interactor = stream_interactor;
@@ -30,8 +31,17 @@ public class MessagePopulator : Object {
 
     public void close(Conversation conversation) { }
 
-    public void populate_number(Conversation conversation, DateTime from, int n) {
-        Gee.List<Entities.Message>? messages = stream_interactor.get_module(MessageStorage.IDENTITY).get_messages_before(conversation, from, n);
+    public void populate_latest(Conversation conversation, int n) {
+        Gee.List<Entities.Message>? messages = stream_interactor.get_module(MessageStorage.IDENTITY).get_messages(conversation, n);
+        if (messages != null) {
+            foreach (Entities.Message message in messages) {
+                handle_message(message, conversation);
+            }
+        }
+    }
+
+    public void populate_before(Conversation conversation, Plugins.MetaConversationItem item, int n) {
+        Gee.List<Entities.Message>? messages = stream_interactor.get_module(MessageStorage.IDENTITY).get_messages_before_message(conversation, meta_message[item], n);
         if (messages != null) {
             foreach (Entities.Message message in messages) {
                 handle_message(message, conversation);
@@ -53,6 +63,7 @@ public class MessagePopulator : Object {
         }
         Plugins.MetaConversationItem? meta_item = best_provider.get_item(message, conversation);
         if (meta_item == null) return;
+        meta_message[meta_item] = message;
 
         meta_item.mark = message.marked;
         WeakRef weak_meta_item = WeakRef(meta_item);