Respond to CR.

Signal/src/ViewControllers/ConversationView/Cells/OWSContactOffersCell.m

@@ -74,7 +74,6 @@ NS_ASSUME_NONNULL_BEGIN
     buttonStackView.spacing = self.vSpacing;
     // Ensure all of the buttons have the same width.
     buttonStackView.alignment = UIStackViewAlignmentFill;
-    buttonStackView.layoutMargins = UIEdgeInsetsZero;
 
     self.stackView = [[UIStackView alloc] initWithArrangedSubviews:@[
         self.titleLabel,
@@ -83,7 +82,6 @@ NS_ASSUME_NONNULL_BEGIN
     self.stackView.axis = UILayoutConstraintAxisVertical;
     self.stackView.spacing = self.vSpacing;
     self.stackView.alignment = UIStackViewAlignmentCenter;
-    self.stackView.layoutMargins = UIEdgeInsetsZero;
     [self.contentView addSubview:self.stackView];
 }
 

Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m

@@ -925,7 +925,7 @@ NS_ASSUME_NONNULL_BEGIN
                 mediaHeight *= factor;
             }
 
-            return CGSizeRound(CGSizeMake(mediaWidth, mediaHeight));
+            result = CGSizeRound(CGSizeMake(mediaWidth, mediaHeight));
             break;
         }
         case OWSMessageCellType_Audio:

Signal/src/ViewControllers/ConversationView/Cells/OWSSystemMessageCell.m

@@ -66,7 +66,6 @@ NS_ASSUME_NONNULL_BEGIN
     self.stackView.axis = UILayoutConstraintAxisHorizontal;
     self.stackView.spacing = self.hSpacing;
     self.stackView.alignment = UIStackViewAlignmentCenter;
-    self.stackView.layoutMargins = UIEdgeInsetsZero;
     [self.contentView addSubview:self.stackView];
 
     UITapGestureRecognizer *tap =

Signal/src/ViewControllers/ConversationView/ConversationViewItem.m

@@ -260,7 +260,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType)
     return measurementCell;
 }
 
-- (CGFloat)vSpacingWithLastLayoutItem:(id<ConversationViewLayoutItem>)lastLayoutItem
+- (CGFloat)vSpacingWithPreviousLayoutItem:(id<ConversationViewLayoutItem>)lastLayoutItem
 {
     OWSAssert(lastLayoutItem);
 

Signal/src/ViewControllers/ConversationView/ConversationViewLayout.h

@@ -21,7 +21,7 @@ typedef NS_ENUM(NSInteger, ConversationViewLayoutAlignment) {
 
 - (ConversationViewLayoutAlignment)layoutAlignment;
 
-- (CGFloat)vSpacingWithLastLayoutItem:(id<ConversationViewLayoutItem>)lastLayoutItem;
+- (CGFloat)vSpacingWithPreviousLayoutItem:(id<ConversationViewLayoutItem>)lastLayoutItem;
 
 @end
 

Signal/src/ViewControllers/ConversationView/ConversationViewLayout.m

@@ -102,10 +102,10 @@ NS_ASSUME_NONNULL_BEGIN
     CGFloat contentBottom = y;
 
     NSInteger row = 0;
-    id<ConversationViewLayoutItem> _Nullable lastLayoutItem = nil;
+    id<ConversationViewLayoutItem> _Nullable previousLayoutItem = nil;
     for (id<ConversationViewLayoutItem> layoutItem in layoutItems) {
-        if (lastLayoutItem) {
+        if (previousLayoutItem) {
-            y += [layoutItem vSpacingWithLastLayoutItem:lastLayoutItem];
+            y += [layoutItem vSpacingWithPreviousLayoutItem:previousLayoutItem];
         }
 
         CGSize layoutSize = CGSizeCeil([layoutItem cellSize]);
@@ -126,7 +126,7 @@ NS_ASSUME_NONNULL_BEGIN
         contentBottom = itemFrame.origin.y + itemFrame.size.height;
         y = contentBottom;
         row++;
-        lastLayoutItem = layoutItem;
+        previousLayoutItem = layoutItem;
     }
 
     contentBottom += self.layoutInfo.contentMarginBottom;

Signal/src/ViewControllers/MessageDetailViewController.swift

@@ -74,6 +74,8 @@ class MessageDetailViewController: OWSViewController, MediaGalleryDataSourceDele
         self.uiDatabaseConnection.beginLongLivedReadTransaction()
         updateDBConnectionAndMessageToLatest()
 
+        self.conversationLayoutInfo.viewWidth = view.width()
+
         self.navigationItem.title = NSLocalizedString("MESSAGE_METADATA_VIEW_TITLE",
                                                       comment: "Title for the 'message metadata' view.")