diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 657f28f341..a3319a4a3f 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -938,7 +938,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     bnvActions.getMenu().findItem(R.id.action_delete).setVisible(debug ||
                             (inTrash && message.msgid != null) ||
                             (!inTrash && hasTrash && message.uid != null) ||
-                            (inOutbox && (!TextUtils.isEmpty(message.error) || !message.identitySynchronize)));
+                            (inOutbox && !TextUtils.isEmpty(message.error)));
                     bnvActions.getMenu().findItem(R.id.action_delete).setTitle(inTrash ? R.string.title_delete : R.string.title_trash);
 
                     bnvActions.getMenu().findItem(R.id.action_move).setVisible(
diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java
index 093e278e1e..a8eaa87b2a 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -49,7 +49,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.synchronize AS identitySynchronize" +
+            ", identity.name AS identityName, identity.email AS identityEmail" +
             ", COUNT(message.id) AS count" +
             ", " + unseen_unified + " AS unseen" +
             ", " + unflagged_unified + " AS unflagged" +
@@ -94,7 +94,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.synchronize AS identitySynchronize" +
+            ", identity.name AS identityName, identity.email AS identityEmail" +
             ", COUNT(message.id) AS count" +
             ", " + unseen_folder + " AS unseen" +
             ", " + unflagged_folder + " AS unflagged" +
@@ -131,7 +131,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.synchronize AS identitySynchronize" +
+            ", identity.name AS identityName, identity.email AS identityEmail" +
             ", 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" +
@@ -237,7 +237,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.synchronize AS identitySynchronize" +
+            ", identity.name AS identityName, identity.email AS identityEmail" +
             ", 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" +
@@ -255,7 +255,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.synchronize AS identitySynchronize" +
+            ", identity.name AS identityName, identity.email AS identityEmail" +
             ", 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 d4db43ea7d..ef04e54b69 100644
--- a/app/src/main/java/eu/faircode/email/TupleMessageEx.java
+++ b/app/src/main/java/eu/faircode/email/TupleMessageEx.java
@@ -32,7 +32,6 @@ 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;
@@ -56,7 +55,6 @@ 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 &&
@@ -84,6 +82,7 @@ public class TupleMessageEx extends EntityMessage {
                     this.unseen == other.unseen &&
                     this.unflagged == other.unflagged &&
                     this.attachments == other.attachments &&
+                    this.drafts == other.drafts &&
                     this.visible == other.visible &&
                     Objects.equals(this.totalSize, other.totalSize) &&
                     this.duplicate == other.duplicate);