From d6a51a2a4226644abc91257e3b359a19e4261b68 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Tue, 22 Jan 2019 10:21:43 -0500
Subject: [PATCH] Fix merge breakage.

---
 .../ConversationView/ConversationViewController.m           | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index 7b45cbdc7..bad4ced52 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -3600,7 +3600,8 @@ typedef enum : NSUInteger {
         TSOutgoingMessage *message = [ThreadUtil enqueueMessageWithAttachments:attachments
                                                                    messageBody:messageText
                                                                       inThread:self.thread
-                                                              quotedReplyModel:self.inputToolbar.quotedReply];
+                                                              quotedReplyModel:self.inputToolbar.quotedReply
+                                                                   linkPreview:nil];
 
         [self messageWasSent:message];
 
@@ -3977,7 +3978,8 @@ typedef enum : NSUInteger {
         // before the attachment is downloaded)
         message = [ThreadUtil enqueueMessageWithAttachment:attachment
                                                   inThread:self.thread
-                                          quotedReplyModel:self.inputToolbar.quotedReply];
+                                          quotedReplyModel:self.inputToolbar.quotedReply
+                                               linkPreview:nil];
     } else {
         [self.uiDatabaseConnection readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) {
             message = [ThreadUtil enqueueMessageWithText:text