diff --git a/app/src/main/java/eu/faircode/email/ViewModelMessages.java b/app/src/main/java/eu/faircode/email/ViewModelMessages.java
index 433692ab18..9ea8fef16a 100644
--- a/app/src/main/java/eu/faircode/email/ViewModelMessages.java
+++ b/app/src/main/java/eu/faircode/email/ViewModelMessages.java
@@ -277,7 +277,8 @@ public class ViewModelMessages extends ViewModel {
                 int count = ds.countItems();
                 for (int i = 0; i < count; i += 100)
                     for (TupleMessageEx message : ds.loadRange(i, Math.min(100, count - i)))
-                        ids.add(message.id);
+                        if (message.uid != null)
+                            ids.add(message.id);
 
                 Log.i("Loaded messages #" + ids.size());
                 return ids;