diff --git a/app/src/main/java/eu/faircode/email/Fts4DbHelper.java b/app/src/main/java/eu/faircode/email/Fts4DbHelper.java
index a3e54957c7..7994779442 100644
--- a/app/src/main/java/eu/faircode/email/Fts4DbHelper.java
+++ b/app/src/main/java/eu/faircode/email/Fts4DbHelper.java
@@ -137,7 +137,8 @@ public class Fts4DbHelper extends SQLiteOpenHelper {
         try (Cursor cursor = db.rawQuery(
                 "SELECT term FROM message_terms" +
                         " WHERE term LIKE ?" +
-                        " ORDER BY occurrences DESC" +
+                        " GROUP BY term" +
+                        " ORDER BY SUM(occurrences) DESC" +
                         " LIMIT " + max,
                 new String[]{query})) {
             while (cursor != null && cursor.moveToNext())