diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 41995afa7d..ca1243ce5c 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -30,6 +30,7 @@ import android.content.pm.PackageManager;
 import android.content.res.ColorStateList;
 import android.database.Cursor;
 import android.graphics.Color;
+import android.graphics.Rect;
 import android.graphics.Typeface;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
@@ -55,6 +56,7 @@ import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
+import android.view.TouchDelegate;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
@@ -211,7 +213,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         private LiveData<List<EntityAttachment>> liveAttachments = null;
         private Observer<List<EntityAttachment>> observerAttachments = null;
 
-        ViewHolder(View itemView) {
+        ViewHolder(final View itemView) {
             super(itemView);
 
             this.itemView = itemView.findViewById(R.id.clItem);
@@ -287,7 +289,22 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         }
 
         private void wire() {
-            itemView.setOnClickListener(this);
+            if (viewType == ViewType.THREAD) {
+                ivExpander.setOnClickListener(this);
+                itemView.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        Rect rect = new Rect(
+                                itemView.getLeft(),
+                                ivExpander.getTop(),
+                                itemView.getRight(),
+                                ivExpander.getBottom());
+                        Log.i("Touch delegate=" + rect);
+                        itemView.setTouchDelegate(new TouchDelegate(rect, ivExpander));
+                    }
+                });
+            } else
+                itemView.setOnClickListener(this);
             ivSnoozed.setOnClickListener(this);
             ivFlagged.setOnClickListener(this);
             ivExpanderAddress.setOnClickListener(this);
@@ -302,7 +319,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         }
 
         private void unwire() {
-            itemView.setOnClickListener(null);
+            if (viewType == ViewType.THREAD)
+                ivExpander.setOnClickListener(null);
+            else
+                itemView.setOnClickListener(null);
             ivSnoozed.setOnClickListener(null);
             ivFlagged.setOnClickListener(null);
             ivExpanderAddress.setOnClickListener(null);
diff --git a/app/src/main/res/layout/item_message_compact.xml b/app/src/main/res/layout/item_message_compact.xml
index 7033a793f9..df8ae76db1 100644
--- a/app/src/main/res/layout/item_message_compact.xml
+++ b/app/src/main/res/layout/item_message_compact.xml
@@ -34,6 +34,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical|center_horizontal"
             android:layout_marginStart="6dp"
+            android:background="?android:attr/selectableItemBackgroundBorderless"
             android:src="@drawable/baseline_expand_less_24"
             android:visibility="visible"
             app:layout_constraintBottom_toBottomOf="@+id/paddingBottom"
diff --git a/app/src/main/res/layout/item_message_normal.xml b/app/src/main/res/layout/item_message_normal.xml
index 996644d5e8..9fc2d0eaf7 100644
--- a/app/src/main/res/layout/item_message_normal.xml
+++ b/app/src/main/res/layout/item_message_normal.xml
@@ -33,6 +33,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical|center_horizontal"
             android:layout_marginStart="6dp"
+            android:background="?android:attr/selectableItemBackgroundBorderless"
             android:src="@drawable/baseline_expand_less_24"
             android:visibility="visible"
             app:layout_constraintBottom_toBottomOf="@+id/paddingBottom"