From 7e921b7935924a44521d52f750cf0814e63c5ea7 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Wed, 4 Apr 2018 15:58:08 -0400
Subject: [PATCH] Refine appearance of quoted reply message cells.

---
 .../ConversationView/Cells/OWSMessageCell.m               | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
index 4c83320dc..b8ceb122c 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
@@ -1178,14 +1178,14 @@ NS_ASSUME_NONNULL_BEGIN
     OWSAssert(self.viewItem);
     OWSAssert([self.viewItem.interaction isKindOfClass:[TSMessage class]]);
 
-    if (!self.isQuotedReply || !self.hasQuotedText) {
+    if (!self.isQuotedReply) {
         return CGSizeZero;
     }
 
     TSMessage *message = (TSMessage *)self.viewItem.interaction;
-    OWSQuotedMessageView *quotedMessageView =
-        [OWSQuotedMessageView quotedMessageViewForConversation:message.quotedMessage
-                                         displayableQuotedText:self.viewItem.displayableQuotedText];
+    OWSQuotedMessageView *quotedMessageView = [OWSQuotedMessageView
+        quotedMessageViewForConversation:message.quotedMessage
+                   displayableQuotedText:(self.hasQuotedText ? self.viewItem.displayableQuotedText : nil)];
     const int maxMessageWidth = [self maxMessageWidthForContentWidth:contentWidth];
     CGSize result = [quotedMessageView sizeForMaxWidth:maxMessageWidth - kBubbleThornSideInset];
     result.width += kBubbleThornSideInset;