diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index f2d6b0cf9d..cb11c6758f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -209,6 +209,8 @@ public class FragmentMessages extends FragmentEx {
         });
 
         rvMessage.setHasFixedSize(false);
+        //rvMessage.setItemViewCacheSize(10);
+        //rvMessage.getRecycledViewPool().setMaxRecycledViews(0, 10);
         LinearLayoutManager llm = new LinearLayoutManager(getContext());
         rvMessage.setLayoutManager(llm);
 
diff --git a/app/src/main/java/eu/faircode/email/SimpleTask.java b/app/src/main/java/eu/faircode/email/SimpleTask.java
index f8408a73f9..1769d1d86b 100644
--- a/app/src/main/java/eu/faircode/email/SimpleTask.java
+++ b/app/src/main/java/eu/faircode/email/SimpleTask.java
@@ -47,7 +47,7 @@ public abstract class SimpleTask<T> implements LifecycleObserver {
     private Bundle args;
     private Result stored;
 
-    private ExecutorService executor = Executors.newCachedThreadPool(Helper.backgroundThreadFactory);
+    private static ExecutorService executor = Executors.newCachedThreadPool(Helper.backgroundThreadFactory);
 
     public void load(Context context, LifecycleOwner owner, Bundle args) {
         run(context, owner, args);