diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 67e8b5f368..de1401cae1 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -509,8 +509,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         });
 
         rvMessage.setHasFixedSize(false);
-        rvMessage.setItemViewCacheSize(20); // Default: 2
-        //rvMessage.getRecycledViewPool().setMaxRecycledViews(0, 10);
+        rvMessage.setItemViewCacheSize(10); // Default: 2
+        //rvMessage.getRecycledViewPool().setMaxRecycledViews(0, 10); // Default 5
 
         final LinearLayoutManager llm = new LinearLayoutManager(getContext()) {
             private Rect parentRect = new Rect();