diff --git a/app/src/main/java/eu/faircode/email/AdapterAccount.java b/app/src/main/java/eu/faircode/email/AdapterAccount.java
index aa1a52d8b7..17f6ad95bd 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAccount.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAccount.java
@@ -243,7 +243,7 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
         public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
             TupleAccountEx f1 = prev.get(oldItemPosition);
             TupleAccountEx f2 = next.get(newItemPosition);
-            return f1.equals(f2);
+            return f1.uiEquals(f2);
         }
     }
 
diff --git a/app/src/main/java/eu/faircode/email/TupleAccountEx.java b/app/src/main/java/eu/faircode/email/TupleAccountEx.java
index 2469e6c6f5..7cd738bee4 100644
--- a/app/src/main/java/eu/faircode/email/TupleAccountEx.java
+++ b/app/src/main/java/eu/faircode/email/TupleAccountEx.java
@@ -19,11 +19,31 @@ package eu.faircode.email;
     Copyright 2018-2019 by Marcel Bokhorst (M66B)
 */
 
+import java.util.Objects;
+
 public class TupleAccountEx extends EntityAccount {
     public int unseen;
     public int unsent;
     public int operations;
 
+    public boolean uiEquals(Object obj) {
+        if (obj instanceof TupleAccountEx) {
+            TupleAccountEx other = (TupleAccountEx) obj;
+            return (this.user.equals(other.user) &&
+                    Objects.equals(this.name, other.name) &&
+                    Objects.equals(this.color, other.color) &&
+                    this.synchronize.equals(other.synchronize) &&
+                    this.primary.equals(other.primary) &&
+                    Objects.equals(this.tbd, other.tbd) &&
+                    Objects.equals(this.state, other.state) &&
+                    Objects.equals(this.error, other.error) &&
+                    Objects.equals(this.last_connected, other.last_connected) &&
+                    this.unseen == other.unseen);
+        } else
+            return false;
+
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (obj instanceof TupleAccountEx) {