diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index d8e63937e4..5069af9ea9 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -2140,7 +2140,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
                         updateState(folders);
 
-                        boolean outbox = EntityFolder.OUTBOX.equals(folder.type);
+                        boolean outbox = (folder != null && EntityFolder.OUTBOX.equals(folder.type));
                         if (FragmentMessages.this.outbox != outbox) {
                             FragmentMessages.this.outbox = outbox;
                             getActivity().invalidateOptionsMenu();