diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 794192a569..01ae6246e2 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -234,7 +234,7 @@ public class FragmentMessages extends FragmentEx {
         });
         rvMessage.setAdapter(adapter);
 
-        if (viewType == AdapterMessage.ViewType.FOLDER) {
+        if (viewType == AdapterMessage.ViewType.FOLDER && BuildConfig.DEBUG) {
             selectionTracker = new SelectionTracker.Builder<>(
                     "messages-selection",
                     rvMessage,