diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 3d72fbdc6d..87b04168d7 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -322,7 +322,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
     private boolean gotoTop = false;
     private Integer gotoPos = null;
-    private boolean firstClick = false;
     private AsyncPagedListDiffer<TupleMessageEx> differ;
     private Map<Long, Integer> keyPosition = new HashMap<>();
     private Map<Integer, Long> positionKey = new HashMap<>();
@@ -4339,13 +4338,15 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         return;
                     }
 
-                    firstClick = !firstClick;
+                    boolean firstClick = !properties.getValue("firstClick", message.id);
+                    properties.setValue("firstClick", message.id, firstClick);
                     if (firstClick) {
                         ApplicationEx.getMainHandler().postDelayed(new Runnable() {
                             @Override
                             public void run() {
+                                boolean firstClick = properties.getValue("firstClick", message.id);
                                 if (firstClick) {
-                                    firstClick = false;
+                                    properties.setValue("firstClick", message.id, false);
                                     lbm.sendBroadcast(viewThread);
                                     properties.setValue("selected", message.id, true);
                                 }