diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index 45f6e4c7f4..dc5edc0293 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -943,10 +943,8 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
     }
 
     void setCompact(boolean compact) {
-        if (this.show_compact != compact) {
+        if (this.show_compact != compact)
             this.show_compact = compact;
-            notifyDataSetChanged();
-        }
     }
 
     void setShowHidden(boolean show_hidden) {
@@ -957,10 +955,8 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
     }
 
     void setShowFlagged(boolean show_flagged) {
-        if (this.show_flagged != show_flagged) {
+        if (this.show_flagged != show_flagged)
             this.show_flagged = show_flagged;
-            notifyDataSetChanged();
-        }
     }
 
     void setSubscribedOnly(boolean subscribed_only) {
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index e5dbdbed5e..b40a129336 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -5723,7 +5723,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
     void setCompact(boolean compact) {
         if (this.compact != compact) {
             this.compact = compact;
-            notifyDataSetChanged();
+            properties.refresh();
         }
     }
 
@@ -5731,7 +5731,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         if (this.zoom != zoom) {
             this.zoom = zoom;
             textSize = Helper.getTextSize(context, zoom);
-            notifyDataSetChanged();
+            properties.refresh();
         }
     }
 
@@ -5742,7 +5742,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
     void setSort(String sort) {
         if (!sort.equals(this.sort)) {
             this.sort = sort;
-            notifyDataSetChanged();
+            properties.refresh();
             // Needed to redraw item decorators / add/remove size
         }
     }
@@ -5762,7 +5762,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
     void setFilterDuplicates(boolean filter_duplicates) {
         if (this.filter_duplicates != filter_duplicates) {
             this.filter_duplicates = filter_duplicates;
-            notifyDataSetChanged();
+            properties.refresh();
         }
     }
 
@@ -5967,6 +5967,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
         void reply(TupleMessageEx message, String selected, View anchor);
 
+        void refresh();
+
         void finish();
     }
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java
index 60cc5745c8..5f6b2b85f7 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolders.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java
@@ -507,6 +507,16 @@ public class FragmentFolders extends FragmentBase {
 
         getActivity().invalidateOptionsMenu();
         adapter.setCompact(compact);
+        rvFolder.post(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    adapter.notifyDataSetChanged();
+                } catch (Throwable ex) {
+                    Log.e(ex);
+                }
+            }
+        });
     }
 
     private void onMenuShowHidden() {
@@ -523,6 +533,16 @@ public class FragmentFolders extends FragmentBase {
 
         getActivity().invalidateOptionsMenu();
         adapter.setShowFlagged(show_flagged);
+        rvFolder.post(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    adapter.notifyDataSetChanged();
+                } catch (Throwable ex) {
+                    Log.e(ex);
+                }
+            }
+        });
     }
 
     private void onMenuSubscribedOnly() {
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 4769f634e8..a9c3e8ccde 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -1793,6 +1793,20 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
             onReply(message, selected, anchor);
         }
 
+        @Override
+        public void refresh() {
+            rvMessage.post(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        adapter.notifyDataSetChanged();
+                    } catch (Throwable ex) {
+                        Log.e(ex);
+                    }
+                }
+            });
+        }
+
         @Override
         public void finish() {
             FragmentMessages.this.finish();