diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/QuoteView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/QuoteView.kt
index 9f1fca0a07..c0353939c2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/QuoteView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/QuoteView.kt
@@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.conversation.v2.messages
 import android.content.Context
 import android.content.res.Resources
 import android.util.AttributeSet
+import android.util.Log
 import android.view.LayoutInflater
 import android.widget.LinearLayout
 import android.widget.RelativeLayout
@@ -59,9 +60,12 @@ class QuoteView : LinearLayout {
     fun getIntrinsicContentHeight(): Int {
         var result = 0
         val width = screenWidth
-        val author = quoteViewAuthorTextView.text
-        val authorTextViewIntrinsicHeight = TextUtilities.getIntrinsicHeight(author, quoteViewAuthorTextView.paint, width)
-        result += authorTextViewIntrinsicHeight
+        var authorTextViewIntrinsicHeight = 0
+        if (quoteViewAuthorTextView.isVisible) {
+            val author = quoteViewAuthorTextView.text
+            authorTextViewIntrinsicHeight = TextUtilities.getIntrinsicHeight(author, quoteViewAuthorTextView.paint, width)
+            result += authorTextViewIntrinsicHeight
+        }
         val body = quoteViewBodyTextView.text
         val bodyTextViewIntrinsicHeight = TextUtilities.getIntrinsicHeight(body, quoteViewBodyTextView.paint, width)
         result += bodyTextViewIntrinsicHeight
diff --git a/app/src/main/res/layout/view_quote.xml b/app/src/main/res/layout/view_quote.xml
index 8bb1001018..7adc8a652e 100644
--- a/app/src/main/res/layout/view_quote.xml
+++ b/app/src/main/res/layout/view_quote.xml
@@ -26,6 +26,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="30dp"
+        android:gravity="center_vertical"
         android:layout_alignParentStart="true"
         android:layout_centerVertical="true"
         android:orientation="vertical">