diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
index d9b32b182e..08ed73c746 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
@@ -33,6 +33,7 @@ static void *kConversationInputTextViewObservingContext = &kConversationInputTex
 const CGFloat kMinTextViewHeight = 38;
 const CGFloat kMinToolbarItemHeight = 44;
 const CGFloat kMaxTextViewHeight = 98;
+const CGFloat kMaxIPadTextViewHeight = 142;
 
 #pragma mark -
 
@@ -1267,7 +1268,9 @@ const CGFloat kMaxTextViewHeight = 98;
     // `textView.contentSize` isn't accurate when restoring a multiline draft, so we compute it here.
     textView.contentSize = contentSize;
 
-    CGFloat newHeight = CGFloatClamp(contentSize.height, kMinTextViewHeight, kMaxTextViewHeight);
+    CGFloat newHeight = CGFloatClamp(contentSize.height,
+        kMinTextViewHeight,
+        UIDevice.currentDevice.isIPad ? kMaxIPadTextViewHeight : kMaxTextViewHeight);
 
     if (newHeight != self.textViewHeight) {
         self.textViewHeight = newHeight;