diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index e73e75f486..97bb1ef95c 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -1100,7 +1100,7 @@ public class FragmentMessages extends FragmentEx {
                             @Override
                             public void onLoaded() {
                                 pbWait.setVisibility(View.GONE);
-                                if (messages.getValue().size() == 0)
+                                if (messages.getValue() == null || messages.getValue().size() == 0)
                                     tvNoEmail.setVisibility(View.VISIBLE);
                             }