diff --git a/res/layout/conversation_list_item_view.xml b/res/layout/conversation_list_item_view.xml
index 2dafff95fc..1965dfeda4 100644
--- a/res/layout/conversation_list_item_view.xml
+++ b/res/layout/conversation_list_item_view.xml
@@ -83,7 +83,7 @@
                 app:backgroundColorHint="?conversation_background"
                 android:visibility="gone"
                 tools:src="@drawable/ic_video_light"
-                tools:visibility="visible"                />
+                tools:visibility="visible" />
 
         <TextView android:id="@id/date"
                   android:layout_marginLeft="3dip"
diff --git a/src/org/thoughtcrime/securesms/ConversationListItem.java b/src/org/thoughtcrime/securesms/ConversationListItem.java
index 950e5442f1..0f51dce854 100644
--- a/src/org/thoughtcrime/securesms/ConversationListItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationListItem.java
@@ -94,13 +94,7 @@ public class ConversationListItem extends RelativeLayout
     this.dateView          = (TextView)        findViewById(R.id.date);
     this.contactPhotoImage = (AvatarImageView) findViewById(R.id.contact_photo_image);
     this.thumbnailView     = (ThumbnailView)   findViewById(R.id.thumbnail);
-
-    this.thumbnailView.setOnClickListener(new View.OnClickListener() {
-      @Override
-      public void onClick(View v) {
-        ConversationListItem.this.performClick();
-      }
-    });
+    thumbnailView.setClickable(false);
   }
 
   public void set(@NonNull MasterSecret masterSecret, @NonNull ThreadRecord thread,