diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
index 4d1713ccb..e9d74a2f3 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
@@ -253,8 +253,7 @@ NS_ASSUME_NONNULL_BEGIN
     OWSAssert([self.viewItem.interaction isKindOfClass:[TSMessage class]]);
 
     NSValue *_Nullable quotedMessageSize = [self quotedMessageSize];
-    // TODO:
-    //    CGSize bodyMediaContentSize = [self bodyMediaSize];
+    NSValue *_Nullable bodyMediaSize = [self bodyMediaSize];
     NSValue *_Nullable bodyTextSize = [self bodyTextSize];
 
     [self.bubbleView addSubview:self.stackView];
@@ -464,6 +463,11 @@ NS_ASSUME_NONNULL_BEGIN
                                  [self autoSetDimension:ALDimensionWidth toSize:bubbleSize.width],
                              ]];
                          }];
+    if (bodyMediaView) {
+        OWSAssert(bodyMediaSize);
+        [self.viewConstraints
+            addObject:[bodyMediaView autoSetDimension:ALDimensionHeight toSize:bodyMediaSize.CGSizeValue.height]];
+    }
 
     [self updateBubbleColor];