diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 7efb1098b0..5e37aa4def 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -875,9 +875,11 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             ibFlagged.setOnClickListener(this);
             if (viewType == ViewType.THREAD) {
                 ibFlagged.setOnLongClickListener(this);
-                tvFolder.setOnClickListener(this);
-                if (selectableItemBackground != 0)
-                    tvFolder.setBackgroundResource(selectableItemBackground);
+                if (!BuildConfig.PLAY_STORE) {
+                    tvFolder.setOnClickListener(this);
+                    if (selectableItemBackground != 0)
+                        tvFolder.setBackgroundResource(selectableItemBackground);
+                }
             }
             ibHelp.setOnClickListener(this);
 
@@ -972,7 +974,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             ibFlagged.setOnClickListener(null);
             if (viewType == ViewType.THREAD) {
                 ibFlagged.setOnLongClickListener(null);
-                tvFolder.setOnClickListener(null);
+                if (!BuildConfig.PLAY_STORE)
+                    tvFolder.setOnClickListener(null);
             }
             ibHelp.setOnClickListener(null);