diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/quotes/MessageQuoteHeaderDecoration.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/quotes/MessageQuoteHeaderDecoration.kt
index 50429f3e3..6bd452f6e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/quotes/MessageQuoteHeaderDecoration.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/quotes/MessageQuoteHeaderDecoration.kt
@@ -8,9 +8,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.children
-import androidx.core.view.marginEnd
 import androidx.core.view.marginLeft
-import androidx.core.view.marginStart
 import androidx.recyclerview.widget.RecyclerView
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.util.ViewUtil
@@ -60,7 +58,7 @@ class MessageQuoteHeaderDecoration(context: Context) : RecyclerView.ItemDecorati
 
     val header: View = LayoutInflater.from(parent.context).inflate(R.layout.message_quote_header_decoration, parent, false)
 
-    val widthSpec = View.MeasureSpec.makeMeasureSpec(parent.width - header.marginStart - header.marginEnd, View.MeasureSpec.EXACTLY)
+    val widthSpec = View.MeasureSpec.makeMeasureSpec(parent.width, View.MeasureSpec.EXACTLY)
     val heightSpec = View.MeasureSpec.makeMeasureSpec(parent.height, View.MeasureSpec.UNSPECIFIED)
 
     val childWidth = ViewGroup.getChildMeasureSpec(
diff --git a/app/src/main/res/layout/message_quote_header_decoration.xml b/app/src/main/res/layout/message_quote_header_decoration.xml
index 78547d699..5774f31c4 100644
--- a/app/src/main/res/layout/message_quote_header_decoration.xml
+++ b/app/src/main/res/layout/message_quote_header_decoration.xml
@@ -3,8 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginStart="24dp"
-    android:layout_marginEnd="24dp"
+    android:paddingHorizontal="24dp"
     android:maxLines="2"
     android:ellipsize="end"
     android:text="@string/MessageQuotesBottomSheet_replies"