diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index 0cc6fb68d0..14b90c2a64 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -146,13 +146,15 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
         private void wire() {
             view.setOnClickListener(this);
             ivExpander.setOnClickListener(this);
-            view.setOnLongClickListener(this);
+            if (listener == null)
+                view.setOnLongClickListener(this);
         }
 
         private void unwire() {
             view.setOnClickListener(null);
             ivExpander.setOnClickListener(null);
-            view.setOnLongClickListener(null);
+            if (listener == null)
+                view.setOnLongClickListener(null);
         }
 
         private void bindTo(final TupleFolderEx folder) {