diff --git a/app/src/main/java/eu/faircode/email/DaoAccount.java b/app/src/main/java/eu/faircode/email/DaoAccount.java
index c723c638cd..6735c1f6d4 100644
--- a/app/src/main/java/eu/faircode/email/DaoAccount.java
+++ b/app/src/main/java/eu/faircode/email/DaoAccount.java
@@ -89,7 +89,7 @@ public interface DaoAccount {
             "    WHERE account.synchronize) AS operations")
     LiveData<TupleAccountStats> liveStats();
 
-    @Query("SELECT account.id, swipe_left, l.type AS left_type, swipe_right, r.type AS right_type" +
+    @Query("SELECT account.id, l.id, l.type AS left_type, r.id, r.type AS right_type" +
             " FROM account" +
             " LEFT JOIN folder l ON l.id = account.swipe_left" +
             " LEFT JOIN folder r ON r.id = account.swipe_right")