diff --git a/res/layout/quote_view.xml b/res/layout/quote_view.xml
index 58ded4baf7..3c56fdcc06 100644
--- a/res/layout/quote_view.xml
+++ b/res/layout/quote_view.xml
@@ -6,7 +6,6 @@
     android:id="@+id/quote_container"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:orientation="horizontal"
     android:visibility="gone"
     android:layout_margin="3dp"
     tools:visibility="visible">
diff --git a/src/org/thoughtcrime/securesms/components/QuoteView.java b/src/org/thoughtcrime/securesms/components/QuoteView.java
index 8222c1062a..555c4d4400 100644
--- a/src/org/thoughtcrime/securesms/components/QuoteView.java
+++ b/src/org/thoughtcrime/securesms/components/QuoteView.java
@@ -13,6 +13,7 @@ import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -33,7 +34,7 @@ import org.thoughtcrime.securesms.util.Util;
 
 import java.util.List;
 
-public class QuoteView extends LinearLayout implements RecipientModifiedListener {
+public class QuoteView extends FrameLayout implements RecipientModifiedListener {
 
   private static final String TAG = QuoteView.class.getSimpleName();