diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index a8ddfa63ee..d768c40df8 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -510,7 +510,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         });
 
         rvMessage.setHasFixedSize(false);
-        //rvMessage.setItemViewCacheSize(10);
+        rvMessage.setItemViewCacheSize(100); // Default: 2
         //rvMessage.getRecycledViewPool().setMaxRecycledViews(0, 10);
 
         final LinearLayoutManager llm = new LinearLayoutManager(getContext()) {