diff --git a/src/dbmail-mailbox.c b/src/dbmail-mailbox.c
index c7df8da3..214bc07e 100644
--- a/src/dbmail-mailbox.c
+++ b/src/dbmail-mailbox.c
@@ -1064,7 +1064,7 @@ static gboolean _do_sort(GNode *node, DbmailMailbox *self)
 	if (s->searched) return FALSE;
 
 	q = g_string_new("");
-	g_string_printf(q, "SELECT message_idnr FROM %smessages m "
+	g_string_printf(q, "SELECT DISTINCT(message_idnr) FROM %smessages m "
 			"LEFT JOIN %sphysmessage p ON m.physmessage_id=p.id "
 			"%s"
 			"WHERE m.mailbox_idnr = %llu AND m.status IN (%d,%d) "