diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.swift b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.swift
index f296d94c40..d4eb31c008 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.swift
+++ b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.swift
@@ -2083,7 +2083,7 @@ extension ConversationInputToolbar: ConversationTextViewToolbarDelegate {
 
     private func updateHeightWithTextView(_ textView: UITextView) {
 
-        let maxSize = CGSize(width: textView.width, height: CGFloat.greatestFiniteMagnitude)
+        let maxSize = CGSize(width: textView.width - textView.textContainerInset.totalWidth, height: CGFloat.greatestFiniteMagnitude)
         var contentSize = textView.attributedText.boundingRect(with: maxSize, options: [.usesLineFragmentOrigin, .usesFontLeading], context: nil).size
         contentSize.height += textView.textContainerInset.top
         contentSize.height += textView.textContainerInset.bottom