diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 21ffd17b4e..e9ba128996 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -552,8 +552,11 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
             // Selected / disabled
             view.setActivated(selectionTracker != null && selectionTracker.isSelected(message.id));
-            view.setAlpha(message.uid == null && !EntityFolder.OUTBOX.equals(message.folderType)
-                    ? Helper.LOW_LIGHT : 1.0f);
+            view.setAlpha(
+                    (EntityFolder.OUTBOX.equals(message.folderType)
+                            ? message.identitySynchronize == null || !message.identitySynchronize
+                            : message.uid == null)
+                            ? Helper.LOW_LIGHT : 1.0f);
 
             // Duplicate
             if (viewType == ViewType.THREAD) {
diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java
index 416f48954a..f0a897bf8a 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -44,7 +44,7 @@ public interface DaoMessage {
     @Query("SELECT message.*" +
             ", account.name AS accountName, IFNULL(identity.color, account.color) AS accountColor, account.notify AS accountNotify" +
             ", folder.name AS folderName, folder.display AS folderDisplay, folder.type AS folderType" +
-            ", identity.name AS identityName, identity.email AS identityEmail" +
+            ", identity.name AS identityName, identity.email AS identityEmail, identity.synchronize AS identitySynchronize" +
             ", COUNT(message.id) AS count" +
             ", " + unseen_unified + " AS unseen" +
             ", " + unflagged_unified + " AS unflagged" +
@@ -90,7 +90,7 @@ public interface DaoMessage {
     @Query("SELECT message.*" +
             ", account.name AS accountName, IFNULL(identity.color, account.color) AS accountColor, account.notify AS accountNotify" +
             ", folder.name AS folderName, folder.display AS folderDisplay, folder.type AS folderType" +
-            ", identity.name AS identityName, identity.email AS identityEmail" +
+            ", identity.name AS identityName, identity.email AS identityEmail, identity.synchronize AS identitySynchronize" +
             ", COUNT(message.id) AS count" +
             ", " + unseen_folder + " AS unseen" +
             ", " + unflagged_folder + " AS unflagged" +
@@ -133,7 +133,7 @@ public interface DaoMessage {
     @Query("SELECT message.*" +
             ", account.name AS accountName, IFNULL(identity.color, account.color) AS accountColor, account.notify AS accountNotify" +
             ", folder.name AS folderName, folder.display AS folderDisplay, folder.type AS folderType" +
-            ", identity.name AS identityName, identity.email AS identityEmail" +
+            ", identity.name AS identityName, identity.email AS identityEmail, identity.synchronize AS identitySynchronize" +
             ", 1 AS count" +
             ", CASE WHEN message.ui_seen THEN 0 ELSE 1 END AS unseen" +
             ", CASE WHEN message.ui_flagged THEN 0 ELSE 1 END AS unflagged" +
@@ -239,7 +239,7 @@ public interface DaoMessage {
     @Query("SELECT message.*" +
             ", account.name AS accountName, identity.color AS accountColor, account.notify AS accountNotify" +
             ", folder.name AS folderName, folder.display AS folderDisplay, folder.type AS folderType" +
-            ", identity.name AS identityName, identity.email AS identityEmail" +
+            ", identity.name AS identityName, identity.email AS identityEmail, identity.synchronize AS identitySynchronize" +
             ", 1 AS count" +
             ", CASE WHEN message.ui_seen THEN 0 ELSE 1 END AS unseen" +
             ", CASE WHEN message.ui_flagged THEN 0 ELSE 1 END AS unflagged" +
@@ -257,7 +257,7 @@ public interface DaoMessage {
     @Query("SELECT message.*" +
             ", account.name AS accountName, IFNULL(identity.color, account.color) AS accountColor, account.notify AS accountNotify" +
             ", folder.name AS folderName, folder.display AS folderDisplay, folder.type AS folderType" +
-            ", identity.name AS identityName, identity.email AS identityEmail" +
+            ", identity.name AS identityName, identity.email AS identityEmail, identity.synchronize AS identitySynchronize" +
             ", 1 AS count" +
             ", 1 AS unseen" +
             ", 0 AS unflagged" +
diff --git a/app/src/main/java/eu/faircode/email/TupleMessageEx.java b/app/src/main/java/eu/faircode/email/TupleMessageEx.java
index ef04e54b69..7bd8f4bcf4 100644
--- a/app/src/main/java/eu/faircode/email/TupleMessageEx.java
+++ b/app/src/main/java/eu/faircode/email/TupleMessageEx.java
@@ -32,6 +32,7 @@ public class TupleMessageEx extends EntityMessage {
     public String folderType;
     public String identityName;
     public String identityEmail;
+    public Boolean identitySynchronize;
     public int count;
     public int unseen;
     public int unflagged;
@@ -55,6 +56,7 @@ public class TupleMessageEx extends EntityMessage {
                     this.folderType.equals(other.folderType) &&
                     Objects.equals(this.identityName, other.identityName) &&
                     Objects.equals(this.identityEmail, other.identityEmail) &&
+                    Objects.equals(this.identitySynchronize, other.identitySynchronize) &&
                     this.count == other.count &&
                     this.unseen == other.unseen &&
                     this.unflagged == other.unflagged &&