diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
index 6766bb2c7..f09b1038a 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
@@ -848,17 +848,6 @@ NS_ASSUME_NONNULL_BEGIN
     [self cropViewToBubbbleShape:self.customView];
 }
 
-- (CGFloat)maxCellHeight
-{
-    static CGFloat value = 0.f;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        CGSize screenSize = [UIScreen mainScreen].bounds.size;
-        value = MAX(screenSize.width, screenSize.height);
-    });
-    return value;
-}
-
 - (CGSize)cellSizeForViewWidth:(int)viewWidth contentWidth:(int)contentWidth
 {
     OWSAssert(self.viewItem);
@@ -880,8 +869,6 @@ NS_ASSUME_NONNULL_BEGIN
             // Honor dynamic type in the message bodies.
             self.textView.font = [self textMessageFont];
             CGSize textSize = [self.textView sizeThatFits:CGSizeMake(maxTextWidth, CGFLOAT_MAX)];
-            // Constrain the max text cell height to the height of the screen.
-            textSize.height = MIN(textSize.height, self.maxCellHeight);
             CGFloat tapForMoreHeight = (self.displayableText.isTextTruncated ? [self tapForMoreHeight] : 0.f);
             cellSize = CGSizeMake((CGFloat)ceil(textSize.width + leftMargin + rightMargin),
                 (CGFloat)ceil(textSize.height + textVMargin * 2 + tapForMoreHeight));