diff --git a/messaging/repository/message.go b/messaging/repository/message.go
index 2d1057cf4..294b9f6cd 100644
--- a/messaging/repository/message.go
+++ b/messaging/repository/message.go
@@ -215,7 +215,9 @@ func (r *message) FindThreads(filter types.MessageFilter) (set types.MessageSet,
 					"id IN (SELECT DISTINCT reply_to FROM messaging_message WHERE rel_user = ?)",
 					filter.CurrentUserID),
 			},
-		})
+		}).
+		OrderBy("id DESC").
+		Limit(uint64(f.Limit))
 
 	// Prepare the actual message selector
 	query := r.query().Join("originals ON (original_id IN (id, reply_to))")