diff --git a/res/layout/thumbnail_view.xml b/res/layout/thumbnail_view.xml
index 75017775b7..739fae50f7 100644
--- a/res/layout/thumbnail_view.xml
+++ b/res/layout/thumbnail_view.xml
@@ -6,6 +6,7 @@
             android:id="@+id/thumbnail_image"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:scaleType="fitCenter"
             android:adjustViewBounds="true"
             android:contentDescription="@string/conversation_item__mms_image_description"
             android:layout_margin="@dimen/media_bubble_border_width"
diff --git a/src/org/thoughtcrime/securesms/components/ThumbnailView.java b/src/org/thoughtcrime/securesms/components/ThumbnailView.java
index 6bba8f5122..b5c6c5d3ca 100644
--- a/src/org/thoughtcrime/securesms/components/ThumbnailView.java
+++ b/src/org/thoughtcrime/securesms/components/ThumbnailView.java
@@ -193,13 +193,14 @@ public class ThumbnailView extends FrameLayout {
     }
 
     return  Glide.with(getContext()).load(new DecryptableUri(masterSecret, slide.getThumbnailUri()))
+                                    .asBitmap()
                                     .centerCrop();
   }
 
   private GenericRequestBuilder buildPlaceholderGlideRequest(Slide slide) {
     return Glide.with(getContext()).load(slide.getPlaceholderRes(getContext().getTheme()))
-                                   .fitCenter()
-                                   .crossFade();
+                                   .asBitmap()
+                                   .fitCenter();
   }
 
   private void animateOutProgress() {