From 75e51b5ed3b639b9cf7b16b0ddbee7e362c44ef1 Mon Sep 17 00:00:00 2001
From: fiaxh <git@mx.ax.lt>
Date: Tue, 4 Apr 2017 15:47:00 +0200
Subject: MessageStorage/Processor, correctly resolve conversations (fixup
 22adbd3)

---
 libdino/src/service/database.vala | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'libdino/src/service/database.vala')

diff --git a/libdino/src/service/database.vala b/libdino/src/service/database.vala
index 797fd6c9..a74ac056 100644
--- a/libdino/src/service/database.vala
+++ b/libdino/src/service/database.vala
@@ -190,7 +190,10 @@ public class Database : Qlite.Database {
 
     public Gee.List<Message> get_unsend_messages(Account account) {
         Gee.List<Message> ret = new ArrayList<Message>();
-        foreach (Row row in message.select().with(message.marked, "=", (int) Message.Marked.UNSENT)) {
+        var select = message.select()
+            .with(message.account_id, "=", account.id)
+            .with(message.marked, "=", (int) Message.Marked.UNSENT);
+        foreach (Row row in select) {
             ret.add(new Message.from_row(this, row));
         }
         return ret;
-- 
cgit v1.2.3-70-g09d2