diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index f9a73d6316..f10bb532e1 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -4687,6 +4687,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         same = false;
                         Log.i("keyword colors changed id=" + next.id);
                     }
+                    if (prev.update) {
+                        Log.i("Always update");
+                        same = false;
+                    }
 
                     return same;
                 }
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index d18d4a9081..aba2b20d13 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -1726,6 +1726,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 return;
             }
 
+            message.update = true;
+
             if (message.accountProtocol != EntityAccount.TYPE_IMAP)
                 if (direction == ItemTouchHelper.LEFT) {
                     adapter.notifyItemChanged(pos);
diff --git a/app/src/main/java/eu/faircode/email/TupleMessageEx.java b/app/src/main/java/eu/faircode/email/TupleMessageEx.java
index 1da27f369f..e06b7d1b7c 100644
--- a/app/src/main/java/eu/faircode/email/TupleMessageEx.java
+++ b/app/src/main/java/eu/faircode/email/TupleMessageEx.java
@@ -59,7 +59,10 @@ public class TupleMessageEx extends EntityMessage {
     public Integer ui_importance;
 
     @Ignore
-    boolean duplicate;
+    public boolean update = false;
+
+    @Ignore
+    public boolean duplicate;
 
     @Ignore
     public Integer[] keyword_colors;