diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java
index c5cfb9df6c..3ef36a208f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java
@@ -35,6 +35,7 @@ public class ConversationItemThumbnail extends FrameLayout {
   private boolean                borderless;
   private int[]                  normalBounds;
   private int[]                  gifBounds;
+  private int                    minimumThumbnailWidth;
 
   public ConversationItemThumbnail(Context context) {
     super(context);
@@ -85,6 +86,8 @@ public class ConversationItemThumbnail extends FrameLayout {
         1,
         Integer.MAX_VALUE
     };
+
+    minimumThumbnailWidth = -1;
   }
 
   @SuppressWarnings("SuspiciousNameCombination")
@@ -150,6 +153,7 @@ public class ConversationItemThumbnail extends FrameLayout {
   }
 
   public void setMinimumThumbnailWidth(int width) {
+    minimumThumbnailWidth = width;
     thumbnail.setMinimumThumbnailWidth(width);
   }
 
@@ -171,6 +175,10 @@ public class ConversationItemThumbnail extends FrameLayout {
         setThumbnailBounds(gifBounds);
       } else {
         setThumbnailBounds(normalBounds);
+
+        if (minimumThumbnailWidth != -1) {
+          thumbnail.setMinimumThumbnailWidth(minimumThumbnailWidth);
+        }
       }
 
       thumbnail.setVisibility(VISIBLE);