diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java
index d2db39d37a..68458ff088 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -243,7 +243,7 @@ public interface DaoMessage {
 
     @Query("SELECT message.*" +
             " FROM message" +
-            " JOIN account ON account.id = message.account" +
+            " LEFT JOIN account ON account.id = message.account" +
             " WHERE account = :account" +
             " AND thread = :thread" +
             " AND (:id IS NULL OR message.id = :id)" +