diff --git a/app/src/main/java/eu/faircode/email/AdapterAccount.java b/app/src/main/java/eu/faircode/email/AdapterAccount.java
index f89a39b77d..aee46bb51a 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAccount.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAccount.java
@@ -152,7 +152,7 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
 
         all = accounts;
 
-        DiffUtil.DiffResult diff = DiffUtil.calculateDiff(new MessageDiffCallback(filtered, all));
+        DiffUtil.DiffResult diff = DiffUtil.calculateDiff(new DiffCallback(filtered, all));
 
         filtered.clear();
         filtered.addAll(all);
@@ -181,11 +181,11 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
         diff.dispatchUpdatesTo(this);
     }
 
-    private class MessageDiffCallback extends DiffUtil.Callback {
+    private class DiffCallback extends DiffUtil.Callback {
         private List<EntityAccount> prev;
         private List<EntityAccount> next;
 
-        MessageDiffCallback(List<EntityAccount> prev, List<EntityAccount> next) {
+        DiffCallback(List<EntityAccount> prev, List<EntityAccount> next) {
             this.prev = prev;
             this.next = next;
         }
diff --git a/app/src/main/java/eu/faircode/email/AdapterAnswer.java b/app/src/main/java/eu/faircode/email/AdapterAnswer.java
index 6770f1b9f0..3f6492fe02 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAnswer.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAnswer.java
@@ -148,7 +148,7 @@ public class AdapterAnswer extends RecyclerView.Adapter<AdapterAnswer.ViewHolder
 
         all = answers;
 
-        DiffUtil.DiffResult diff = DiffUtil.calculateDiff(new MessageDiffCallback(filtered, all));
+        DiffUtil.DiffResult diff = DiffUtil.calculateDiff(new DiffCallback(filtered, all));
 
         filtered.clear();
         filtered.addAll(all);
@@ -177,11 +177,11 @@ public class AdapterAnswer extends RecyclerView.Adapter<AdapterAnswer.ViewHolder
         diff.dispatchUpdatesTo(this);
     }
 
-    private class MessageDiffCallback extends DiffUtil.Callback {
+    private class DiffCallback extends DiffUtil.Callback {
         private List<EntityAnswer> prev;
         private List<EntityAnswer> next;
 
-        MessageDiffCallback(List<EntityAnswer> prev, List<EntityAnswer> next) {
+        DiffCallback(List<EntityAnswer> prev, List<EntityAnswer> next) {
             this.prev = prev;
             this.next = next;
         }
diff --git a/app/src/main/java/eu/faircode/email/AdapterAttachment.java b/app/src/main/java/eu/faircode/email/AdapterAttachment.java
index 44c8ade125..acf440d535 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAttachment.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAttachment.java
@@ -353,7 +353,7 @@ public class AdapterAttachment extends RecyclerView.Adapter<AdapterAttachment.Vi
 
         all = attachments;
 
-        DiffUtil.DiffResult diff = DiffUtil.calculateDiff(new MessageDiffCallback(filtered, all));
+        DiffUtil.DiffResult diff = DiffUtil.calculateDiff(new DiffCallback(filtered, all));
 
         filtered.clear();
         filtered.addAll(all);
@@ -382,11 +382,11 @@ public class AdapterAttachment extends RecyclerView.Adapter<AdapterAttachment.Vi
         diff.dispatchUpdatesTo(this);
     }
 
-    private class MessageDiffCallback extends DiffUtil.Callback {
+    private class DiffCallback extends DiffUtil.Callback {
         private List<EntityAttachment> prev;
         private List<EntityAttachment> next;
 
-        MessageDiffCallback(List<EntityAttachment> prev, List<EntityAttachment> next) {
+        DiffCallback(List<EntityAttachment> prev, List<EntityAttachment> next) {
             this.prev = prev;
             this.next = next;
         }
diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index 1b5dee48e4..c0a0eb991f 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -448,7 +448,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
             if (!folder.hide || showAll)
                 shown.add((TupleFolderEx) folder);
 
-        DiffUtil.DiffResult diff = DiffUtil.calculateDiff(new MessageDiffCallback(filtered, shown));
+        DiffUtil.DiffResult diff = DiffUtil.calculateDiff(new DiffCallback(filtered, shown));
 
         filtered.clear();
         filtered.addAll(shown);
@@ -477,11 +477,11 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
         diff.dispatchUpdatesTo(this);
     }
 
-    private class MessageDiffCallback extends DiffUtil.Callback {
+    private class DiffCallback extends DiffUtil.Callback {
         private List<TupleFolderEx> prev;
         private List<TupleFolderEx> next;
 
-        MessageDiffCallback(List<TupleFolderEx> prev, List<TupleFolderEx> next) {
+        DiffCallback(List<TupleFolderEx> prev, List<TupleFolderEx> next) {
             this.prev = prev;
             this.next = next;
         }
diff --git a/app/src/main/java/eu/faircode/email/AdapterIdentity.java b/app/src/main/java/eu/faircode/email/AdapterIdentity.java
index fd258f0c00..b4dffef736 100644
--- a/app/src/main/java/eu/faircode/email/AdapterIdentity.java
+++ b/app/src/main/java/eu/faircode/email/AdapterIdentity.java
@@ -152,7 +152,7 @@ public class AdapterIdentity extends RecyclerView.Adapter<AdapterIdentity.ViewHo
 
         all = identities;
 
-        DiffUtil.DiffResult diff = DiffUtil.calculateDiff(new MessageDiffCallback(filtered, all));
+        DiffUtil.DiffResult diff = DiffUtil.calculateDiff(new DiffCallback(filtered, all));
 
         filtered.clear();
         filtered.addAll(all);
@@ -181,11 +181,11 @@ public class AdapterIdentity extends RecyclerView.Adapter<AdapterIdentity.ViewHo
         diff.dispatchUpdatesTo(this);
     }
 
-    private class MessageDiffCallback extends DiffUtil.Callback {
+    private class DiffCallback extends DiffUtil.Callback {
         private List<TupleIdentityEx> prev;
         private List<TupleIdentityEx> next;
 
-        MessageDiffCallback(List<TupleIdentityEx> prev, List<TupleIdentityEx> next) {
+        DiffCallback(List<TupleIdentityEx> prev, List<TupleIdentityEx> next) {
             this.prev = prev;
             this.next = next;
         }
diff --git a/app/src/main/java/eu/faircode/email/AdapterImage.java b/app/src/main/java/eu/faircode/email/AdapterImage.java
index c4578d8899..db1a9efa40 100644
--- a/app/src/main/java/eu/faircode/email/AdapterImage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterImage.java
@@ -191,7 +191,7 @@ public class AdapterImage extends RecyclerView.Adapter<AdapterImage.ViewHolder>
 
         all = attachments;
 
-        DiffUtil.DiffResult diff = DiffUtil.calculateDiff(new MessageDiffCallback(filtered, all));
+        DiffUtil.DiffResult diff = DiffUtil.calculateDiff(new DiffCallback(filtered, all));
 
         filtered.clear();
         filtered.addAll(all);
@@ -220,11 +220,11 @@ public class AdapterImage extends RecyclerView.Adapter<AdapterImage.ViewHolder>
         diff.dispatchUpdatesTo(this);
     }
 
-    private class MessageDiffCallback extends DiffUtil.Callback {
+    private class DiffCallback extends DiffUtil.Callback {
         private List<EntityAttachment> prev;
         private List<EntityAttachment> next;
 
-        MessageDiffCallback(List<EntityAttachment> prev, List<EntityAttachment> next) {
+        DiffCallback(List<EntityAttachment> prev, List<EntityAttachment> next) {
             this.prev = prev;
             this.next = next;
         }
diff --git a/app/src/main/java/eu/faircode/email/AdapterLog.java b/app/src/main/java/eu/faircode/email/AdapterLog.java
index a70685b9c9..bda9ed8a5e 100644
--- a/app/src/main/java/eu/faircode/email/AdapterLog.java
+++ b/app/src/main/java/eu/faircode/email/AdapterLog.java
@@ -75,7 +75,7 @@ public class AdapterLog extends RecyclerView.Adapter<AdapterLog.ViewHolder> {
 
         all = logs;
 
-        DiffUtil.DiffResult diff = DiffUtil.calculateDiff(new MessageDiffCallback(filtered, all));
+        DiffUtil.DiffResult diff = DiffUtil.calculateDiff(new DiffCallback(filtered, all));
 
         filtered.clear();
         filtered.addAll(all);
@@ -104,11 +104,11 @@ public class AdapterLog extends RecyclerView.Adapter<AdapterLog.ViewHolder> {
         diff.dispatchUpdatesTo(this);
     }
 
-    private class MessageDiffCallback extends DiffUtil.Callback {
+    private class DiffCallback extends DiffUtil.Callback {
         private List<EntityLog> prev;
         private List<EntityLog> next;
 
-        MessageDiffCallback(List<EntityLog> prev, List<EntityLog> next) {
+        DiffCallback(List<EntityLog> prev, List<EntityLog> next) {
             this.prev = prev;
             this.next = next;
         }
diff --git a/app/src/main/java/eu/faircode/email/AdapterOperation.java b/app/src/main/java/eu/faircode/email/AdapterOperation.java
index 101147d542..5954c94895 100644
--- a/app/src/main/java/eu/faircode/email/AdapterOperation.java
+++ b/app/src/main/java/eu/faircode/email/AdapterOperation.java
@@ -172,7 +172,7 @@ public class AdapterOperation extends RecyclerView.Adapter<AdapterOperation.View
 
         all = operations;
 
-        DiffUtil.DiffResult diff = DiffUtil.calculateDiff(new MessageDiffCallback(filtered, all));
+        DiffUtil.DiffResult diff = DiffUtil.calculateDiff(new DiffCallback(filtered, all));
 
         filtered.clear();
         filtered.addAll(all);
@@ -201,11 +201,11 @@ public class AdapterOperation extends RecyclerView.Adapter<AdapterOperation.View
         diff.dispatchUpdatesTo(this);
     }
 
-    private class MessageDiffCallback extends DiffUtil.Callback {
+    private class DiffCallback extends DiffUtil.Callback {
         private List<TupleOperationEx> prev;
         private List<TupleOperationEx> next;
 
-        MessageDiffCallback(List<TupleOperationEx> prev, List<TupleOperationEx> next) {
+        DiffCallback(List<TupleOperationEx> prev, List<TupleOperationEx> next) {
             this.prev = prev;
             this.next = next;
         }
diff --git a/app/src/main/java/eu/faircode/email/AdapterRule.java b/app/src/main/java/eu/faircode/email/AdapterRule.java
index ec5598932c..d095df8ae2 100644
--- a/app/src/main/java/eu/faircode/email/AdapterRule.java
+++ b/app/src/main/java/eu/faircode/email/AdapterRule.java
@@ -127,7 +127,7 @@ public class AdapterRule extends RecyclerView.Adapter<AdapterRule.ViewHolder> {
 
         all = rules;
 
-        DiffUtil.DiffResult diff = DiffUtil.calculateDiff(new MessageDiffCallback(filtered, all));
+        DiffUtil.DiffResult diff = DiffUtil.calculateDiff(new DiffCallback(filtered, all));
 
         filtered.clear();
         filtered.addAll(all);
@@ -156,11 +156,11 @@ public class AdapterRule extends RecyclerView.Adapter<AdapterRule.ViewHolder> {
         diff.dispatchUpdatesTo(this);
     }
 
-    private class MessageDiffCallback extends DiffUtil.Callback {
+    private class DiffCallback extends DiffUtil.Callback {
         private List<TupleRuleEx> prev;
         private List<TupleRuleEx> next;
 
-        MessageDiffCallback(List<TupleRuleEx> prev, List<TupleRuleEx> next) {
+        DiffCallback(List<TupleRuleEx> prev, List<TupleRuleEx> next) {
             this.prev = prev;
             this.next = next;
         }