diff --git a/src/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java b/src/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java
index 4d4356f908..7b2973dd3a 100644
--- a/src/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java
+++ b/src/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java
@@ -112,16 +112,6 @@ public class ConversationItemThumbnail extends FrameLayout {
     canvas.drawPath(corners, outlinePaint);
   }
 
-  @Override
-  protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-    super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-
-    if (getMeasuredWidth() != thumbnail.getMeasuredWidth()) {
-      getLayoutParams().width = shade.getLayoutParams().width = thumbnail.getMeasuredWidth();
-      measure(widthMeasureSpec, heightMeasureSpec);
-    }
-  }
-
   @Override
   public void setFocusable(boolean focusable) {
     thumbnail.setFocusable(focusable);