diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MediaAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MediaAdapter.java
index 56a3f5c16e17ece801c3bf53df8214ade895436d..f12a2e6fea13b317203bb2278561731bd4ea23f6 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MediaAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MediaAdapter.java
@@ -137,7 +137,7 @@ public class MediaAdapter extends RecyclerView.Adapter<MediaAdapter.MediaViewHol
             cancelPotentialWork(attachment, holder.binding.media);
             renderPreview(activity, attachment, holder.binding.media);
         }
-        holder.binding.media.setOnClickListener(v -> ViewUtil.view(activity, attachment));
+        holder.binding.getRoot().setOnClickListener(v -> ViewUtil.view(activity, attachment));
     }
 
     public void setAttachments(List<Attachment> attachments) {
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index 7130078701ee1b64c5ae42aaac4389bc607227e4..f879717e4f8ebd7c2ce027c454ff5b54b783d6f0 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -220,7 +219,7 @@
                 </android.support.v7.widget.CardView>
 
                 <android.support.v7.widget.CardView
-                    android:id="@+id/media_wrapper"
+                    android:id="@+id/users_wrapper"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="@dimen/activity_vertical_margin"
@@ -234,7 +233,7 @@
                         android:orientation="vertical">
 
                         <android.support.v7.widget.RecyclerView
-                            android:id="@+id/media"
+                            android:id="@+id/users"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:orientation="horizontal"
@@ -252,14 +251,25 @@
                             android:layout_gravity="end">
 
                             <Button
-                                android:id="@+id/show_media"
+                                android:id="@+id/invite"
                                 style="@style/Widget.Conversations.Button.Borderless"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:minWidth="0dp"
                                 android:paddingLeft="16dp"
                                 android:paddingRight="16dp"
-                                android:text="@string/view_media"
+                                android:text="@string/invite"
+                                android:textColor="?attr/colorAccent" />
+
+                            <Button
+                                android:id="@+id/show_users"
+                                style="@style/Widget.Conversations.Button.Borderless"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:minWidth="0dp"
+                                android:paddingLeft="16dp"
+                                android:paddingRight="16dp"
+                                android:text="@string/view_users"
                                 android:textColor="?attr/colorAccent" />
                         </LinearLayout>
                     </LinearLayout>
@@ -358,9 +368,8 @@
                             android:textAppearance="@style/TextAppearance.Conversations.Caption"/>
                     </LinearLayout>
                 </android.support.v7.widget.CardView>
-
                 <android.support.v7.widget.CardView
-                    android:id="@+id/users_wrapper"
+                    android:id="@+id/media_wrapper"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="@dimen/activity_vertical_margin"
@@ -374,7 +383,7 @@
                         android:orientation="vertical">
 
                         <android.support.v7.widget.RecyclerView
-                            android:id="@+id/users"
+                            android:id="@+id/media"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:orientation="horizontal"
@@ -392,29 +401,19 @@
                             android:layout_gravity="end">
 
                             <Button
-                                android:id="@+id/invite"
-                                style="@style/Widget.Conversations.Button.Borderless"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:minWidth="0dp"
-                                android:paddingLeft="16dp"
-                                android:paddingRight="16dp"
-                                android:text="@string/invite"
-                                android:textColor="?attr/colorAccent" />
-
-                            <Button
-                                android:id="@+id/show_users"
+                                android:id="@+id/show_media"
                                 style="@style/Widget.Conversations.Button.Borderless"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:minWidth="0dp"
                                 android:paddingLeft="16dp"
                                 android:paddingRight="16dp"
-                                android:text="@string/view_users"
+                                android:text="@string/view_media"
                                 android:textColor="?attr/colorAccent" />
                         </LinearLayout>
                     </LinearLayout>
                 </android.support.v7.widget.CardView>
+
             </LinearLayout>
         </ScrollView>
     </LinearLayout>
diff --git a/src/main/res/layout/media.xml b/src/main/res/layout/media.xml
index ad23b7f6f7987854c200c127718edfcbe2fcd209..eb2d5223c89b8adbdaabc9cf1a59afb30e365fa9 100644
--- a/src/main/res/layout/media.xml
+++ b/src/main/res/layout/media.xml
@@ -3,7 +3,8 @@
     <eu.siacs.conversations.ui.widget.SquareFrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:padding="2dp">
+        android:padding="2dp"
+        android:background="?selectableItemBackground">
         <ImageView
             android:id="@+id/media"
             android:layout_width="match_parent"