diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnail.kt b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnail.kt
index b31fca8dc..097733e27 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnail.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnail.kt
@@ -170,13 +170,13 @@ class ConversationItemThumbnail @JvmOverloads constructor(
 
   fun setMinimumThumbnailWidth(@Px width: Int) {
     minimumThumbnailWidth = width
-    state = state.copy(thumbnailViewState = state.thumbnailViewState.copy(minimumThumbnailWidth = width))
+    state = state.copy(thumbnailViewState = state.thumbnailViewState.copy(minWidth = width))
     state.thumbnailViewState.applyState(thumbnail)
   }
 
   fun setMaximumThumbnailHeight(@Px height: Int) {
     maximumThumbnailHeight = height
-    state = state.copy(thumbnailViewState = state.thumbnailViewState.copy(maximumThumbnailHeight = height))
+    state = state.copy(thumbnailViewState = state.thumbnailViewState.copy(maxHeight = height))
     state.thumbnailViewState.applyState(thumbnail)
   }
 
@@ -200,11 +200,11 @@ class ConversationItemThumbnail @JvmOverloads constructor(
         setThumbnailBounds(normalBounds)
 
         if (minimumThumbnailWidth != -1) {
-          state = state.copy(thumbnailViewState = state.thumbnailViewState.copy(minimumThumbnailWidth = minimumThumbnailWidth))
+          state = state.copy(thumbnailViewState = state.thumbnailViewState.copy(minWidth = minimumThumbnailWidth))
         }
 
         if (maximumThumbnailHeight != -1) {
-          state = state.copy(thumbnailViewState = state.thumbnailViewState.copy(maximumThumbnailHeight = maximumThumbnailHeight))
+          state = state.copy(thumbnailViewState = state.thumbnailViewState.copy(maxHeight = maximumThumbnailHeight))
         }
       }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnailState.kt b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnailState.kt
index 8ecb30e3b..600efa272 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnailState.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnailState.kt
@@ -32,8 +32,6 @@ data class ConversationItemThumbnailState(
     private val downloadClickListener: SlidesClickedListener? = null,
     @IgnoredOnParcel
     private val longClickListener: OnLongClickListener? = null,
-    private val minimumThumbnailWidth: Int = -1,
-    private val maximumThumbnailHeight: Int = -1,
     private val visibility: Int = View.GONE,
     private val minWidth: Int = -1,
     private val maxWidth: Int = -1,
@@ -59,8 +57,6 @@ data class ConversationItemThumbnailState(
       thumbnailView.get().setDownloadClickListener(downloadClickListener)
       thumbnailView.get().setOnLongClickListener(longClickListener)
       thumbnailView.get().setBounds(minWidth, maxWidth, minHeight, maxHeight)
-      thumbnailView.get().setMinimumThumbnailWidth(minimumThumbnailWidth)
-      thumbnailView.get().setMaximumThumbnailHeight(maximumThumbnailHeight)
     }
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java b/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java
index 20d85b310..a09727f3d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java
@@ -26,7 +26,6 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.request.Request;
 import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.RequestOptions;
-import com.bumptech.glide.request.transition.Transition;
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
@@ -43,7 +42,6 @@ import org.thoughtcrime.securesms.mms.VideoSlide;
 import org.thoughtcrime.securesms.stories.StoryTextPostModel;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.Util;
-import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
 import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
 import org.thoughtcrime.securesms.util.views.Stub;
@@ -51,7 +49,6 @@ import org.thoughtcrime.securesms.util.views.Stub;
 import java.util.Collections;
 import java.util.Locale;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 
 import static com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions.withCrossFade;