diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index e2e951e6c8..539ebbd94e 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -118,7 +118,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
             itemView.setAlpha(folder.hide ? 0.5f : 1.0f);
 
             vwColor.setBackgroundColor(folder.accountColor == null ? Color.TRANSPARENT : folder.accountColor);
-            //vwColor.setVisibility(account < 0 ? View.VISIBLE : View.GONE);
+            vwColor.setVisibility(account < 0 ? View.VISIBLE : View.GONE);
 
             if (account > 0) {
                 ViewGroup.LayoutParams lp = vwLevel.getLayoutParams();
diff --git a/app/src/main/java/eu/faircode/email/EntityFolder.java b/app/src/main/java/eu/faircode/email/EntityFolder.java
index 8dc11d0396..426148434c 100644
--- a/app/src/main/java/eu/faircode/email/EntityFolder.java
+++ b/app/src/main/java/eu/faircode/email/EntityFolder.java
@@ -124,8 +124,8 @@ public class EntityFolder implements Serializable {
     ); // MUST match SYSTEM_FOLDER_ATTR
 
     static final List<String> FOLDER_SORT_ORDER = Arrays.asList(
-            OUTBOX,
             INBOX,
+            OUTBOX,
             DRAFTS,
             SENT,
             ARCHIVE,