diff --git a/app/src/main/java/eu/faircode/email/AdapterNavUnified.java b/app/src/main/java/eu/faircode/email/AdapterNavUnified.java
index 29fc0167b3..008d7540c9 100644
--- a/app/src/main/java/eu/faircode/email/AdapterNavUnified.java
+++ b/app/src/main/java/eu/faircode/email/AdapterNavUnified.java
@@ -95,8 +95,10 @@ public class AdapterNavUnified extends RecyclerView.Adapter<AdapterNavUnified.Vi
         }
 
         private void bindTo(TupleFolderUnified folder) {
-            if (EntityFolder.INBOX.equals(folder.type) || folder.type == null)
-                ivItem.setImageResource(folder.folders > 1
+            if (folder.type == null)
+                ivItem.setImageResource(R.drawable.twotone_all_inbox_24);
+            else if (EntityFolder.INBOX.equals(folder.type))
+                ivItem.setImageResource(folder.folders > 1 && !folder.unified
                         ? R.drawable.twotone_all_inbox_24
                         : R.drawable.twotone_move_to_inbox_24);
             else if (EntityFolder.OUTBOX.equals(folder.type)) {
@@ -261,6 +263,10 @@ public class AdapterNavUnified extends RecyclerView.Adapter<AdapterNavUnified.Vi
                 show = true;
         }
 
+        TupleFolderUnified inbox = map.get(EntityFolder.INBOX);
+        if (inbox != null)
+            inbox.unified = true;
+
         List<TupleFolderUnified> types = new ArrayList<>();
         for (String type : map.keySet())
             types.add(map.get(type));