Respond to CR.

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

@@ -41,8 +41,6 @@ NS_ASSUME_NONNULL_BEGIN
 {
     OWSAssert(!self.titleLabel);
 
-    self.preservesSuperviewLayoutMargins = NO;
-    self.contentView.preservesSuperviewLayoutMargins = NO;
     self.layoutMargins = UIEdgeInsetsZero;
     self.contentView.layoutMargins = UIEdgeInsetsZero;
 

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

@@ -49,8 +49,6 @@ NS_ASSUME_NONNULL_BEGIN
     // Ensure only called once.
     OWSAssert(!self.messageBubbleView);
 
-    self.preservesSuperviewLayoutMargins = NO;
-    self.contentView.preservesSuperviewLayoutMargins = NO;
     self.layoutMargins = UIEdgeInsetsZero;
     self.contentView.layoutMargins = UIEdgeInsetsZero;
 

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

@@ -46,8 +46,6 @@ NS_ASSUME_NONNULL_BEGIN
 {
     OWSAssert(!self.imageView);
 
-    self.preservesSuperviewLayoutMargins = NO;
-    self.contentView.preservesSuperviewLayoutMargins = NO;
     self.layoutMargins = UIEdgeInsetsZero;
     self.contentView.layoutMargins = UIEdgeInsetsZero;
 

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

@@ -40,8 +40,6 @@ NS_ASSUME_NONNULL_BEGIN
 {
     OWSAssert(!self.titleLabel);
 
-    self.preservesSuperviewLayoutMargins = NO;
-    self.contentView.preservesSuperviewLayoutMargins = NO;
     self.layoutMargins = UIEdgeInsetsZero;
     self.contentView.layoutMargins = UIEdgeInsetsZero;
 

Signal/src/ViewControllers/MessageDetailViewController.swift

@@ -87,20 +87,12 @@ class MessageDetailViewController: OWSViewController, MediaGalleryDataSourceDele
             object: OWSPrimaryStorage.shared().dbNotificationObject)
     }
 
-    override public func viewWillLayoutSubviews() {
+    override public func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
         Logger.debug("\(self.logTag) in \(#function)")
 
-        super.viewWillLayoutSubviews()
+        super.viewWillTransition(to: size, with: coordinator)
 
-        self.conversationLayoutInfo.viewWidth = self.view.width()
-    }
-
-    override public func viewDidLayoutSubviews() {
-        Logger.debug("\(self.logTag) in \(#function)")
-
-        super.viewDidLayoutSubviews()
-
-        self.conversationLayoutInfo.viewWidth = self.view.width()
+        self.conversationLayoutInfo.viewWidth = size.width
     }
 
     override func viewWillAppear(_ animated: Bool) {