diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
index ab5bf1ad7..7a7fc7824 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
@@ -92,7 +92,6 @@ static const CGFloat ConversationInputToolbarBorderViewHeight = 0.5;
     // to determine the height of the rendered inputAccessoryView.
     CGFloat height = self.toolbarHeight + ConversationInputToolbarBorderViewHeight;
     if (self.quotedMessagePreview) {
-        height += self.quotedMessageTopMargin;
         height += self.quotedMessagePreview.intrinsicContentSize.height;
     }
     CGSize newSize = CGSizeMake(self.bounds.size.width, height);
@@ -128,8 +127,6 @@ static const CGFloat ConversationInputToolbarBorderViewHeight = 0.5;
     _composeContainer = [UIView containerView];
     _contentStackView = [[UIStackView alloc] initWithArrangedSubviews:@[ _composeContainer ]];
     _contentStackView.axis = UILayoutConstraintAxisVertical;
-    _contentStackView.layoutMargins = UIEdgeInsetsZero;
-    _contentStackView.layoutMarginsRelativeArrangement = YES;
 
     [self addSubview:_contentStackView];
     [_contentStackView autoPinEdgesToSuperviewEdges];
@@ -292,12 +289,6 @@ static const CGFloat ConversationInputToolbarBorderViewHeight = 0.5;
 
     // TODO animate
     [self.contentStackView insertArrangedSubview:self.quotedMessagePreview atIndex:0];
-    self.contentStackView.layoutMargins = UIEdgeInsetsMake(self.quotedMessageTopMargin, 0, 0, 0);
-}
-
-- (CGFloat)quotedMessageTopMargin
-{
-    return 5.f;
 }
 
 - (void)clearQuotedMessagePreview
@@ -308,7 +299,6 @@ static const CGFloat ConversationInputToolbarBorderViewHeight = 0.5;
         [self.quotedMessagePreview removeFromSuperview];
         self.quotedMessagePreview = nil;
     }
-    self.contentStackView.layoutMargins = UIEdgeInsetsZero;
 }
 
 - (void)beginEditingTextMessage