diff --git a/Signal/src/Models/TSMessageAdapaters/TSAnimatedAdapter.m b/Signal/src/Models/TSMessageAdapaters/TSAnimatedAdapter.m
index 1fa980234..8850ed7b0 100644
--- a/Signal/src/Models/TSMessageAdapaters/TSAnimatedAdapter.m
+++ b/Signal/src/Models/TSMessageAdapaters/TSAnimatedAdapter.m
@@ -88,8 +88,8 @@ NS_ASSUME_NONNULL_BEGIN
         FLAnimatedImageView *imageView = [[FLAnimatedImageView alloc] init];
         imageView.animatedImage        = animatedGif;
         CGSize size                    = [self mediaViewDisplaySize];
-        imageView.frame                = CGRectMake(0.0, 0.0, size.width, size.height);
         imageView.contentMode          = UIViewContentModeScaleAspectFill;
+        imageView.frame                = CGRectMake(0.0, 0.0, size.width, size.height);
         imageView.clipsToBounds        = YES;
         [JSQMessagesMediaViewBubbleImageMasker applyBubbleImageMaskToMediaView:imageView
                                                                     isOutgoing:self.appliesMediaViewMaskAsOutgoing];
diff --git a/Signal/src/Models/TSMessageAdapaters/TSPhotoAdapter.m b/Signal/src/Models/TSMessageAdapaters/TSPhotoAdapter.m
index c77e56a80..a043aad85 100644
--- a/Signal/src/Models/TSMessageAdapaters/TSPhotoAdapter.m
+++ b/Signal/src/Models/TSMessageAdapaters/TSPhotoAdapter.m
@@ -67,8 +67,8 @@ NS_ASSUME_NONNULL_BEGIN
     if (self.cachedImageView == nil) {
         CGSize size             = [self mediaViewDisplaySize];
         UIImageView *imageView  = [[UIImageView alloc] initWithImage:self.image];
-        imageView.frame         = CGRectMake(0.0f, 0.0f, size.width, size.height);
         imageView.contentMode   = UIViewContentModeScaleAspectFill;
+        imageView.frame         = CGRectMake(0.0f, 0.0f, size.width, size.height);
         imageView.clipsToBounds = YES;
         // Use trilinear filters for better scaling quality at
         // some performance cost.
diff --git a/Signal/src/Models/TSMessageAdapaters/TSVideoAttachmentAdapter.m b/Signal/src/Models/TSMessageAdapaters/TSVideoAttachmentAdapter.m
index 8474db5e7..264c55c7a 100644
--- a/Signal/src/Models/TSMessageAdapaters/TSVideoAttachmentAdapter.m
+++ b/Signal/src/Models/TSMessageAdapaters/TSVideoAttachmentAdapter.m
@@ -121,8 +121,8 @@ NS_ASSUME_NONNULL_BEGIN
     if ([self isVideo]) {
         if (self.cachedImageView == nil) {
             UIImageView *imageView  = [[UIImageView alloc] initWithImage:self.image];
-            imageView.frame         = CGRectMake(0.0f, 0.0f, size.width, size.height);
             imageView.contentMode   = UIViewContentModeScaleAspectFill;
+            imageView.frame         = CGRectMake(0.0f, 0.0f, size.width, size.height);
             imageView.clipsToBounds = YES;
             [JSQMessagesMediaViewBubbleImageMasker applyBubbleImageMaskToMediaView:imageView
                                                                         isOutgoing:self.appliesMediaViewMaskAsOutgoing];