diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index 26f85ee724..d2aed55a3a 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -274,7 +274,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
 
         DB db = DB.getInstance(this);
 
-        db.account().liveAccountsEx().observe(this, new Observer<List<TupleAccountEx>>() {
+        db.account().liveAccountsEx(false).observe(this, new Observer<List<TupleAccountEx>>() {
             private List<TupleAccountEx> last = new ArrayList<>();
 
             @Override
diff --git a/app/src/main/java/eu/faircode/email/AdapterAccount.java b/app/src/main/java/eu/faircode/email/AdapterAccount.java
index b734cf6e0a..e382e85736 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAccount.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAccount.java
@@ -22,6 +22,7 @@ package eu.faircode.email;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
+import android.graphics.Typeface;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -30,6 +31,7 @@ import android.widget.TextView;
 
 import java.text.Collator;
 import java.text.DateFormat;
+import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -48,8 +50,12 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
     private boolean settings;
     private LayoutInflater inflater;
 
-    private List<EntityAccount> items = new ArrayList<>();
+    private int colorUnread;
+    private int textColorSecondary;
 
+    private List<TupleAccountEx> items = new ArrayList<>();
+
+    private static NumberFormat nf = NumberFormat.getNumberInstance();
     private static final DateFormat df = SimpleDateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
 
     public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
@@ -87,11 +93,23 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
             view.setOnClickListener(null);
         }
 
-        private void bindTo(EntityAccount account) {
+        private void bindTo(TupleAccountEx account) {
             view.setActivated(account.tbd != null);
             vwColor.setBackgroundColor(account.color == null ? Color.TRANSPARENT : account.color);
             ivPrimary.setVisibility(account.primary ? View.VISIBLE : View.INVISIBLE);
-            tvName.setText(account.name);
+
+            if (settings)
+                tvName.setText(account.name);
+            else {
+                if (account.unseen > 0)
+                    tvName.setText(context.getString(R.string.title_name_count, account.name, nf.format(account.unseen)));
+                else
+                    tvName.setText(account.name);
+
+                tvName.setTypeface(null, account.unseen > 0 ? Typeface.BOLD : Typeface.NORMAL);
+                tvName.setTextColor(account.unseen > 0 ? colorUnread : textColorSecondary);
+            }
+
             ivSync.setImageResource(account.synchronize ? R.drawable.baseline_sync_24 : R.drawable.baseline_sync_disabled_24);
             ivSync.setVisibility(settings ? View.VISIBLE : View.GONE);
 
@@ -121,7 +139,7 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
             if (pos == RecyclerView.NO_POSITION)
                 return;
 
-            EntityAccount account = items.get(pos);
+            TupleAccountEx account = items.get(pos);
             if (account.tbd != null)
                 return;
 
@@ -137,18 +155,21 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
         this.settings = settings;
         this.inflater = LayoutInflater.from(context);
 
+        this.colorUnread = Helper.resolveColor(context, R.attr.colorUnread);
+        this.textColorSecondary = Helper.resolveColor(context, android.R.attr.textColorSecondary);
+
         setHasStableIds(true);
     }
 
-    public void set(@NonNull List<EntityAccount> accounts) {
+    public void set(@NonNull List<TupleAccountEx> accounts) {
         Log.i("Set accounts=" + accounts.size());
 
         final Collator collator = Collator.getInstance(Locale.getDefault());
         collator.setStrength(Collator.SECONDARY); // Case insensitive, process accents etc
 
-        Collections.sort(accounts, new Comparator<EntityAccount>() {
+        Collections.sort(accounts, new Comparator<TupleAccountEx>() {
             @Override
-            public int compare(EntityAccount a1, EntityAccount a2) {
+            public int compare(TupleAccountEx a1, TupleAccountEx a2) {
                 int n = collator.compare(a1.name, a2.name);
                 if (n != 0)
                     return n;
@@ -188,10 +209,10 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
     }
 
     private class DiffCallback extends DiffUtil.Callback {
-        private List<EntityAccount> prev = new ArrayList<>();
-        private List<EntityAccount> next = new ArrayList<>();
+        private List<TupleAccountEx> prev = new ArrayList<>();
+        private List<TupleAccountEx> next = new ArrayList<>();
 
-        DiffCallback(List<EntityAccount> prev, List<EntityAccount> next) {
+        DiffCallback(List<TupleAccountEx> prev, List<TupleAccountEx> next) {
             this.prev.addAll(prev);
             this.next.addAll(next);
         }
@@ -208,15 +229,15 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
 
         @Override
         public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) {
-            EntityAccount f1 = prev.get(oldItemPosition);
-            EntityAccount f2 = next.get(newItemPosition);
+            TupleAccountEx f1 = prev.get(oldItemPosition);
+            TupleAccountEx f2 = next.get(newItemPosition);
             return f1.id.equals(f2.id);
         }
 
         @Override
         public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
-            EntityAccount f1 = prev.get(oldItemPosition);
-            EntityAccount f2 = next.get(newItemPosition);
+            TupleAccountEx f1 = prev.get(oldItemPosition);
+            TupleAccountEx f2 = next.get(newItemPosition);
             return f1.equals(f2);
         }
     }
@@ -241,7 +262,7 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
     public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
         holder.unwire();
 
-        EntityAccount account = items.get(position);
+        TupleAccountEx account = items.get(position);
         holder.bindTo(account);
 
         holder.wire();
diff --git a/app/src/main/java/eu/faircode/email/DaoAccount.java b/app/src/main/java/eu/faircode/email/DaoAccount.java
index d384be8ad9..4381c8b4a4 100644
--- a/app/src/main/java/eu/faircode/email/DaoAccount.java
+++ b/app/src/main/java/eu/faircode/email/DaoAccount.java
@@ -38,10 +38,6 @@ public interface DaoAccount {
     @Query("SELECT * FROM account WHERE tbd = 1")
     List<EntityAccount> getAccountsTbd();
 
-    @Query("SELECT * FROM account" +
-            " WHERE :all OR account.synchronize")
-    LiveData<List<EntityAccount>> liveAccounts(boolean all);
-
     @Query("SELECT * FROM account WHERE synchronize")
     LiveData<List<EntityAccount>> liveSynchronizingAccounts();
 
@@ -65,9 +61,9 @@ public interface DaoAccount {
             "    AND NOT ui_hide) AS unsent" +
             " FROM account" +
             " LEFT JOIN operation ON operation.account = account.id" +
-            " WHERE synchronize" +
+            " WHERE :all OR account.synchronize" +
             " GROUP BY account.id")
-    LiveData<List<TupleAccountEx>> liveAccountsEx();
+    LiveData<List<TupleAccountEx>> liveAccountsEx(boolean all);
 
     @Query("SELECT * FROM account WHERE id = :id")
     EntityAccount getAccount(long id);
diff --git a/app/src/main/java/eu/faircode/email/FragmentAccounts.java b/app/src/main/java/eu/faircode/email/FragmentAccounts.java
index a9d693e3fb..bb4962d145 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccounts.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccounts.java
@@ -112,10 +112,10 @@ public class FragmentAccounts extends FragmentBase {
         super.onActivityCreated(savedInstanceState);
 
         // Observe accounts
-        DB.getInstance(getContext()).account().liveAccounts(settings)
-                .observe(getViewLifecycleOwner(), new Observer<List<EntityAccount>>() {
+        DB.getInstance(getContext()).account().liveAccountsEx(settings)
+                .observe(getViewLifecycleOwner(), new Observer<List<TupleAccountEx>>() {
                     @Override
-                    public void onChanged(@Nullable List<EntityAccount> accounts) {
+                    public void onChanged(@Nullable List<TupleAccountEx> accounts) {
                         if (accounts == null)
                             accounts = new ArrayList<>();