diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java b/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java
index 1232cc8e8e..b4d9139c3e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java
@@ -19,7 +19,6 @@ import android.view.animation.Interpolator;
 import android.view.animation.TranslateAnimation;
 import android.widget.ImageButton;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -141,7 +140,7 @@ public class InputPanel extends ConstraintLayout
   public void onFinishInflate() {
     super.onFinishInflate();
 
-    View quoteDismiss = findViewById(R.id.quote_dismiss);
+    View quoteDismiss = findViewById(R.id.quote_dismiss_stub);
 
     this.composeContainer       = findViewById(R.id.compose_bubble);
     this.stickerSuggestion      = findViewById(R.id.input_panel_sticker_suggestion);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java b/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java
index f9d8210053..36c8994636 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java
@@ -4,18 +4,16 @@ package org.thoughtcrime.securesms.components;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
-import android.os.Build;
 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.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
+import androidx.constraintlayout.widget.ConstraintLayout;
 
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.google.android.material.imageview.ShapeableImageView;
@@ -45,11 +43,12 @@ import org.thoughtcrime.securesms.stories.StoryTextPostModel;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.Projection;
 import org.thoughtcrime.securesms.util.Util;
+import org.thoughtcrime.securesms.util.views.Stub;
 
 import java.io.IOException;
 import java.util.List;
 
-public class QuoteView extends FrameLayout implements RecipientForeverObserver {
+public class QuoteView extends ConstraintLayout implements RecipientForeverObserver {
 
   private static final String TAG = Log.tag(QuoteView.class);
 
@@ -79,17 +78,13 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
     }
   }
 
-  private View               background;
-  private ViewGroup          mainView;
-  private ViewGroup          footerView;
   private TextView           authorView;
   private EmojiTextView      bodyView;
   private View               quoteBarView;
   private ShapeableImageView thumbnailView;
-  private View               attachmentVideoOverlayView;
-  private ViewGroup          attachmentContainerView;
-  private TextView           attachmentNameView;
-  private ImageView          dismissView;
+  private Stub<View>         attachmentVideoOVerlayStub;
+  private Stub<TextView>     attachmentNameViewStub;
+  private Stub<ImageView>    dismissStub;
   private EmojiImageView     missingStoryReaction;
   private EmojiImageView     storyReactionEmoji;
 
@@ -97,7 +92,7 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
   private LiveRecipient   author;
   private CharSequence    body;
   private TextView        mediaDescriptionText;
-  private TextView        missingLinkText;
+  private Stub<TextView>  missingLinkTextStub;
   private SlideDeck       attachments;
   private MessageType     messageType;
   private int             largeCornerRadius;
@@ -124,32 +119,27 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
     initialize(attrs);
   }
 
-  @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
   public QuoteView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
     super(context, attrs, defStyleAttr, defStyleRes);
     initialize(attrs);
   }
 
   private void initialize(@Nullable AttributeSet attrs) {
-    inflate(getContext(), R.layout.quote_view, this);
+    inflate(getContext(), R.layout.v2_quote_view, this);
 
-    this.background                   = findViewById(R.id.quote_background);
-    this.mainView                     = findViewById(R.id.quote_main);
-    this.footerView                   = findViewById(R.id.quote_missing_footer);
-    this.authorView                   = findViewById(R.id.quote_author);
-    this.bodyView                     = findViewById(R.id.quote_text);
-    this.quoteBarView                 = findViewById(R.id.quote_bar);
-    this.thumbnailView                = findViewById(R.id.quote_thumbnail);
-    this.attachmentVideoOverlayView   = findViewById(R.id.quote_video_overlay);
-    this.attachmentContainerView      = findViewById(R.id.quote_attachment_container);
-    this.attachmentNameView           = findViewById(R.id.quote_attachment_name);
-    this.dismissView                  = findViewById(R.id.quote_dismiss);
-    this.mediaDescriptionText         = findViewById(R.id.media_type);
-    this.missingLinkText              = findViewById(R.id.quote_missing_text);
-    this.missingStoryReaction         = findViewById(R.id.quote_missing_story_reaction_emoji);
-    this.storyReactionEmoji           = findViewById(R.id.quote_story_reaction_emoji);
-    this.largeCornerRadius            = getResources().getDimensionPixelSize(R.dimen.quote_corner_radius_large);
-    this.smallCornerRadius            = getResources().getDimensionPixelSize(R.dimen.quote_corner_radius_bottom);
+    this.authorView                 = findViewById(R.id.quote_author);
+    this.bodyView                   = findViewById(R.id.quote_text);
+    this.quoteBarView               = findViewById(R.id.quote_bar);
+    this.thumbnailView              = findViewById(R.id.quote_thumbnail);
+    this.attachmentVideoOVerlayStub = new Stub<>(findViewById(R.id.quote_video_overlay_stub));
+    this.attachmentNameViewStub     = new Stub<>(findViewById(R.id.quote_attachment_name_stub));
+    this.dismissStub                = new Stub<>(findViewById(R.id.quote_dismiss_stub));
+    this.mediaDescriptionText       = findViewById(R.id.media_type);
+    this.missingLinkTextStub        = new Stub<>(findViewById(R.id.quote_missing_text_stub));
+    this.missingStoryReaction       = findViewById(R.id.quote_missing_story_reaction_emoji);
+    this.storyReactionEmoji         = findViewById(R.id.quote_story_reaction_emoji);
+    this.largeCornerRadius          = getResources().getDimensionPixelSize(R.dimen.quote_corner_radius_large);
+    this.smallCornerRadius          = getResources().getDimensionPixelSize(R.dimen.quote_corner_radius_bottom);
 
     cornerMask = new CornerMask(this);
 
@@ -159,12 +149,10 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
       messageType = MessageType.fromCode(typedArray.getInt(R.styleable.QuoteView_message_type, 0));
       typedArray.recycle();
 
-      dismissView.setVisibility(messageType == MessageType.PREVIEW ? VISIBLE : GONE);
+      dismissStub.setVisibility(messageType == MessageType.PREVIEW ? VISIBLE : GONE);
     }
 
     setMessageType(messageType);
-
-    dismissView.setOnClickListener(view -> setVisibility(GONE));
   }
 
   @Override
@@ -199,7 +187,10 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
     params.width = thumbWidth;
 
     thumbnailView.setLayoutParams(params);
-    dismissView.setVisibility(messageType == MessageType.PREVIEW ? View.VISIBLE : View.GONE);
+    dismissStub.setVisibility(messageType == MessageType.PREVIEW ? View.VISIBLE : View.GONE);
+    if (dismissStub.resolved()) {
+      dismissStub.get().setOnClickListener(view -> setVisibility(GONE));
+    }
   }
 
   public void setQuote(GlideRequests glideRequests,
@@ -365,13 +356,13 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
     boolean outgoing = messageType != MessageType.INCOMING && messageType != MessageType.STORY_REPLY_INCOMING;
     boolean preview  = messageType == MessageType.PREVIEW || messageType == MessageType.STORY_REPLY_PREVIEW;
 
-    mainView.setMinimumHeight(isStoryReply() && originalMissing ? 0 : thumbHeight);
+    // TODO [alex] -- do we need this? mainView.setMinimumHeight(isStoryReply() && originalMissing ? 0 : thumbHeight);
     thumbnailView.setPadding(0, 0, 0, 0);
 
     StoryTextPostModel model = isStoryReply() ? getStoryTextPost(body) : null;
     if (model != null) {
-      attachmentVideoOverlayView.setVisibility(GONE);
-      attachmentContainerView.setVisibility(GONE);
+      attachmentVideoOVerlayStub.setVisibility(GONE);
+      attachmentNameViewStub.setVisibility(GONE);
       thumbnailView.setVisibility(VISIBLE);
       glideRequests.load(model)
                    .centerCrop()
@@ -388,8 +379,8 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
         thumbnailView.setShapeAppearanceModel(buildShapeAppearanceForLayoutDirection());
       }
 
-      attachmentVideoOverlayView.setVisibility(GONE);
-      attachmentContainerView.setVisibility(GONE);
+      attachmentVideoOVerlayStub.setVisibility(GONE);
+      attachmentNameViewStub.setVisibility(GONE);
       thumbnailView.setVisibility(VISIBLE);
       glideRequests.load(R.drawable.ic_gift_thumbnail)
                    .centerCrop()
@@ -403,17 +394,20 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
     Slide documentSlide   = slideDeck.getSlides().stream().filter(Slide::hasDocument).findFirst().orElse(null);
     Slide viewOnceSlide   = slideDeck.getSlides().stream().filter(Slide::hasViewOnce).findFirst().orElse(null);
 
-    attachmentVideoOverlayView.setVisibility(GONE);
+    attachmentVideoOVerlayStub.setVisibility(GONE);
 
     if (viewOnceSlide != null) {
       thumbnailView.setVisibility(GONE);
-      attachmentContainerView.setVisibility(GONE);
+      attachmentNameViewStub.setVisibility(GONE);
     } else if (imageVideoSlide != null && imageVideoSlide.getUri() != null) {
       thumbnailView.setVisibility(VISIBLE);
-      attachmentContainerView.setVisibility(GONE);
-      dismissView.setBackgroundResource(R.drawable.dismiss_background);
+      attachmentNameViewStub.setVisibility(GONE);
+
+      if (dismissStub.resolved()) {
+        dismissStub.get().setBackgroundResource(R.drawable.dismiss_background);
+      }
       if (imageVideoSlide.hasVideo() && !imageVideoSlide.isVideoGif()) {
-        attachmentVideoOverlayView.setVisibility(VISIBLE);
+        attachmentVideoOVerlayStub.setVisibility(VISIBLE);
       }
       glideRequests.load(new DecryptableUri(imageVideoSlide.getUri()))
                    .centerCrop()
@@ -422,17 +416,20 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
                    .into(thumbnailView);
     } else if (documentSlide != null){
       thumbnailView.setVisibility(GONE);
-      attachmentContainerView.setVisibility(VISIBLE);
-      attachmentNameView.setText(documentSlide.getFileName().orElse(""));
+      attachmentNameViewStub.setVisibility(VISIBLE);
+      attachmentNameViewStub.get().setText(documentSlide.getFileName().orElse(""));
     } else {
       thumbnailView.setVisibility(GONE);
-      attachmentContainerView.setVisibility(GONE);
-      dismissView.setBackgroundDrawable(null);
+      attachmentNameViewStub.setVisibility(GONE);
+
+      if (dismissStub.resolved()) {
+        dismissStub.get().setBackground(null);
+      }
     }
   }
 
   private void setQuoteMissingFooter(boolean missing) {
-    footerView.setVisibility(missing && !isStoryReply() ? VISIBLE : GONE);
+    missingLinkTextStub.setVisibility(missing && !isStoryReply() ? VISIBLE : GONE);
   }
 
   private @Nullable StoryTextPostModel getStoryTextPost(@Nullable CharSequence body) {
@@ -501,12 +498,18 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
     QuoteViewColorTheme quoteViewColorTheme = QuoteViewColorTheme.resolveTheme(isOutgoing, isPreview, isWallpaperEnabled);
 
     quoteBarView.setBackgroundColor(quoteViewColorTheme.getBarColor(getContext()));
-    background.setBackgroundColor(quoteViewColorTheme.getBackgroundColor(getContext()));
+    setBackgroundColor(quoteViewColorTheme.getBackgroundColor(getContext()));
     authorView.setTextColor(quoteViewColorTheme.getForegroundColor(getContext()));
     bodyView.setTextColor(quoteViewColorTheme.getForegroundColor(getContext()));
-    attachmentNameView.setTextColor(quoteViewColorTheme.getForegroundColor(getContext()));
+
+    if (attachmentNameViewStub.resolved()) {
+      attachmentNameViewStub.get().setTextColor(quoteViewColorTheme.getForegroundColor(getContext()));
+    }
     mediaDescriptionText.setTextColor(quoteViewColorTheme.getForegroundColor(getContext()));
-    missingLinkText.setTextColor(quoteViewColorTheme.getForegroundColor(getContext()));
-    footerView.setBackgroundColor(quoteViewColorTheme.getBackgroundColor(getContext()));
+
+    if (missingLinkTextStub.resolved()) {
+      missingLinkTextStub.get().setTextColor(quoteViewColorTheme.getForegroundColor(getContext()));
+      missingLinkTextStub.get().setBackgroundColor(quoteViewColorTheme.getBackgroundColor(getContext()));
+    }
   }
 }
diff --git a/app/src/main/res/layout/quote_view.xml b/app/src/main/res/layout/quote_view.xml
deleted file mode 100644
index 5e750c6f17..0000000000
--- a/app/src/main/res/layout/quote_view.xml
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:viewBindingIgnore="true"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/quote_container"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_margin="3dp"
-    android:visibility="gone"
-    tools:parentTag="android.widget.FrameLayout"
-    tools:visibility="visible">
-
-    <LinearLayout
-        android:id="@+id/quote_background"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <View
-            android:id="@+id/quote_bar"
-            android:layout_width="@dimen/quote_corner_radius_bottom"
-            android:layout_height="match_parent"
-            tools:background="@color/signal_colorPrimary" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:id="@+id/quote_main"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginBottom="8dp"
-                    android:layout_weight="1"
-                    android:orientation="vertical">
-
-                    <org.thoughtcrime.securesms.components.emoji.EmojiTextView
-                        android:id="@+id/quote_author"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:ellipsize="end"
-                        android:maxLines="1"
-                        android:textAppearance="@style/Signal.Text.LabelLarge"
-                        android:textColor="@color/core_black"
-                        tools:text="Peter Parker" />
-
-                    <LinearLayout
-                        android:id="@+id/quote_attachment_container"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="2dp"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal"
-                        android:visibility="gone"
-                        tools:visibility="visible">
-
-                        <ImageView
-                            android:layout_width="27dp"
-                            android:layout_height="35dp"
-                            android:layout_marginEnd="4dp"
-                            android:paddingStart="-4dp"
-                            android:src="@drawable/ic_document_small" />
-
-                        <TextView
-                            android:id="@+id/quote_attachment_name"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:ellipsize="end"
-                            android:maxLines="1"
-                            android:textAppearance="@style/Signal.Text.BodyMedium"
-                            android:textColor="@color/core_grey_90"
-                            tools:text="The-Amazing-Spider-Man.cba" />
-
-                    </LinearLayout>
-
-                    <TextView
-                        android:id="@+id/media_type"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="8dp"
-                        android:paddingTop="4dp"
-                        android:textAppearance="@style/Signal.Text.BodyMedium"
-                        android:textColor="@color/core_black"
-                        android:visibility="gone"
-                        tools:text="Photo"
-                        tools:visibility="visible" />
-
-                    <org.thoughtcrime.securesms.components.emoji.EmojiTextView
-                        android:id="@+id/quote_text"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:ellipsize="end"
-                        android:maxLines="2"
-                        android:textAppearance="@style/Signal.Text.BodyMedium"
-                        app:emoji_renderMentions="false"
-                        app:emoji_renderSpoilers="true"
-                        tools:text="With great power comes great responsibility."
-                        tools:visibility="visible" />
-
-                </LinearLayout>
-
-                <org.thoughtcrime.securesms.components.emoji.EmojiImageView
-                    android:id="@+id/quote_missing_story_reaction_emoji"
-                    android:layout_width="32dp"
-                    android:layout_height="32dp"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginStart="12dp"
-                    android:layout_marginEnd="8dp"
-                    android:visibility="gone"
-                    tools:src="@drawable/ic_emoji"
-                    tools:visibility="visible" />
-
-                <FrameLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:background="@color/white">
-
-                    <com.google.android.material.imageview.ShapeableImageView
-                        android:id="@+id/quote_thumbnail"
-                        android:layout_width="@dimen/quote_thumb_size"
-                        android:layout_height="match_parent"
-                        android:scaleType="centerCrop"
-                        android:visibility="gone"
-                        tools:visibility="visible" />
-
-                    <FrameLayout
-                        android:id="@+id/quote_video_overlay"
-                        android:layout_width="32dp"
-                        android:layout_height="32dp"
-                        android:layout_gravity="center"
-                        android:background="@drawable/circle_white"
-                        android:longClickable="false"
-                        android:visibility="gone"
-                        tools:visibility="visible">
-
-                        <androidx.appcompat.widget.AppCompatImageView
-                            android:layout_width="13dp"
-                            android:layout_height="16dp"
-                            android:layout_gravity="center_horizontal"
-                            android:layout_marginTop="8dp"
-                            android:scaleType="fitXY"
-                            android:tint="@color/core_ultramarine"
-                            app:srcCompat="@drawable/exo_icon_play" />
-
-                    </FrameLayout>
-
-                </FrameLayout>
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/quote_missing_footer"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:padding="8dp"
-                android:visibility="gone"
-                tools:visibility="visible">
-
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="8dp"
-                    android:src="@drawable/ic_broken_link"
-                    android:tint="@color/quote_missing_icon_color" />
-
-                <TextView
-                    android:id="@+id/quote_missing_text"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/QuoteView_original_missing"
-                    android:textAppearance="@style/Signal.Text.MaterialCaption"
-                    android:textColor="@color/core_grey_90" />
-
-            </LinearLayout>
-
-
-        </LinearLayout>
-    </LinearLayout>
-
-    <org.thoughtcrime.securesms.components.emoji.EmojiImageView
-        android:id="@+id/quote_story_reaction_emoji"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
-        android:layout_gravity="bottom|end"
-        android:layout_marginEnd="@dimen/quote_story_emoji_margin"
-        android:visibility="gone"
-        tools:src="@drawable/ic_emoji"
-        tools:visibility="visible" />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/quote_dismiss"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:layout_gravity="top|end"
-        android:background="@drawable/dismiss_background"
-        app:srcCompat="@drawable/ic_x_20"
-        app:tint="@color/signal_colorOnSurface" />
-
-</merge>
\ No newline at end of file
diff --git a/app/src/main/res/layout/v2_quote_view.xml b/app/src/main/res/layout/v2_quote_view.xml
new file mode 100644
index 0000000000..fedd781884
--- /dev/null
+++ b/app/src/main/res/layout/v2_quote_view.xml
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2023 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  -->
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"
+    tools:viewBindingIgnore="true">
+
+    <View
+        android:id="@+id/quote_bar"
+        android:layout_width="@dimen/quote_corner_radius_bottom"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:background="@color/signal_colorPrimary" />
+
+    <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+        android:id="@+id/quote_author"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textAppearance="@style/Signal.Text.LabelLarge"
+        android:textColor="@color/core_black"
+        app:layout_constraintBottom_toTopOf="@id/quote_attachment_name_stub"
+        app:layout_constraintEnd_toStartOf="@id/quote_missing_story_reaction_emoji"
+        app:layout_constraintHorizontal_bias="0"
+        app:layout_constraintStart_toEndOf="@id/quote_bar"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:layout_constraintWidth_default="wrap"
+        tools:text="Peter Parker" />
+
+    <ViewStub
+        android:id="@+id/quote_attachment_name_stub"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
+        android:layout_marginEnd="8dp"
+        android:inflatedId="@id/quote_attachment_name_stub"
+        android:layout="@layout/v2_quote_view_attachment_name_stub"
+        app:layout_constraintBottom_toTopOf="@id/media_type"
+        app:layout_constraintEnd_toStartOf="@id/quote_missing_story_reaction_emoji"
+        app:layout_constraintStart_toEndOf="@id/quote_bar"
+        app:layout_constraintTop_toBottomOf="@id/quote_author"
+        app:layout_constraintWidth_default="spread"
+        app:layout_goneMarginBottom="8dp" />
+
+    <TextView
+        android:id="@+id/media_type"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
+        android:paddingTop="4dp"
+        android:textAppearance="@style/Signal.Text.BodyMedium"
+        android:textColor="@color/core_black"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@id/quote_text"
+        app:layout_constraintEnd_toStartOf="@id/quote_missing_story_reaction_emoji"
+        app:layout_constraintHorizontal_bias="0"
+        app:layout_constraintStart_toEndOf="@id/quote_bar"
+        app:layout_constraintTop_toBottomOf="@id/quote_attachment_name_stub"
+        app:layout_constraintWidth_default="wrap"
+        tools:text="Photo"
+        tools:visibility="visible" />
+
+    <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+        android:id="@+id/quote_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:textAppearance="@style/Signal.Text.BodyMedium"
+        app:emoji_renderMentions="false"
+        app:emoji_renderSpoilers="true"
+        app:layout_constrainedWidth="true"
+        app:layout_constraintBottom_toTopOf="@id/content_barrier"
+        app:layout_constraintEnd_toStartOf="@id/quote_missing_story_reaction_emoji"
+        app:layout_constraintHorizontal_bias="0"
+        app:layout_constraintStart_toEndOf="@id/quote_bar"
+        app:layout_constraintTop_toBottomOf="@id/media_type"
+        app:layout_constraintWidth_default="wrap"
+        tools:text="With great power comes great responsibility."
+        tools:visibility="visible" />
+
+    <com.google.android.material.imageview.ShapeableImageView
+        android:id="@+id/quote_thumbnail"
+        android:layout_width="@dimen/quote_thumb_size"
+        android:layout_height="0dp"
+        android:adjustViewBounds="false"
+        android:scaleType="centerCrop"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@id/content_barrier"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible" />
+
+    <ViewStub
+        android:id="@+id/quote_video_overlay_stub"
+        android:layout_width="13dp"
+        android:layout_height="16dp"
+        android:inflatedId="@id/quote_video_overlay_stub"
+        android:layout="@layout/v2_quote_view_video_overlay_stub"
+        app:layout_constraintBottom_toBottomOf="@id/quote_thumbnail"
+        app:layout_constraintEnd_toEndOf="@id/quote_thumbnail"
+        app:layout_constraintStart_toStartOf="@id/quote_thumbnail"
+        app:layout_constraintTop_toTopOf="@id/quote_thumbnail" />
+
+    <org.thoughtcrime.securesms.components.emoji.EmojiImageView
+        android:id="@+id/quote_missing_story_reaction_emoji"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_gravity="center_vertical"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="8dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@id/content_barrier"
+        app:layout_constraintEnd_toStartOf="@id/quote_thumbnail"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@drawable/ic_emoji"
+        tools:visibility="visible" />
+
+    <ViewStub
+        android:id="@+id/quote_dismiss_stub"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:inflatedId="@id/quote_dismiss_stub"
+        android:layout="@layout/v2_quote_view_dismiss_stub"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/content_barrier"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:barrierDirection="bottom"
+        app:constraint_referenced_ids="quote_attachment_name_stub,quote_author,quote_text,media_type" />
+
+    <ViewStub
+        android:id="@+id/quote_missing_text_stub"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:inflatedId="@id/quote_missing_text_stub"
+        android:layout="@layout/v2_quote_view_missing_text_stub"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/quote_bar"
+        app:layout_constraintTop_toBottomOf="@id/content_barrier" />
+
+    <org.thoughtcrime.securesms.components.emoji.EmojiImageView
+        android:id="@+id/quote_story_reaction_emoji"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_marginEnd="@dimen/quote_story_emoji_margin"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        tools:src="@drawable/ic_emoji"
+        tools:visibility="visible" />
+</merge>
\ No newline at end of file
diff --git a/app/src/main/res/layout/v2_quote_view_attachment_name_stub.xml b/app/src/main/res/layout/v2_quote_view_attachment_name_stub.xml
new file mode 100644
index 0000000000..6715fea5aa
--- /dev/null
+++ b/app/src/main/res/layout/v2_quote_view_attachment_name_stub.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2023 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  -->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/quote_attachment_name"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:drawablePadding="4dp"
+    android:ellipsize="end"
+    android:gravity="center_vertical"
+    android:maxLines="1"
+    android:textAppearance="@style/Signal.Text.BodyMedium"
+    android:textColor="@color/core_grey_90"
+    app:drawableStartCompat="@drawable/ic_document_small"
+    tools:text="The-Amazing-Spider-Man.cba" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/v2_quote_view_dismiss_stub.xml b/app/src/main/res/layout/v2_quote_view_dismiss_stub.xml
new file mode 100644
index 0000000000..cbd6e03b8a
--- /dev/null
+++ b/app/src/main/res/layout/v2_quote_view_dismiss_stub.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2023 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  -->
+<androidx.appcompat.widget.AppCompatImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/quote_dismiss"
+    android:layout_width="48dp"
+    android:layout_height="48dp"
+    android:background="@drawable/dismiss_background"
+    app:srcCompat="@drawable/ic_x_20"
+    app:tint="@color/signal_colorOnSurface" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/v2_quote_view_missing_text_stub.xml b/app/src/main/res/layout/v2_quote_view_missing_text_stub.xml
new file mode 100644
index 0000000000..f08d2db3b0
--- /dev/null
+++ b/app/src/main/res/layout/v2_quote_view_missing_text_stub.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2023 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  -->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:drawablePadding="8dp"
+    android:padding="8dp"
+    android:text="@string/QuoteView_original_missing"
+    android:textAppearance="@style/Signal.Text.MaterialCaption"
+    android:textColor="@color/core_grey_90"
+    app:drawableStartCompat="@drawable/ic_broken_link"
+    app:drawableTint="@color/quote_missing_icon_color"
+    tools:visibility="gone" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/v2_quote_view_video_overlay_stub.xml b/app/src/main/res/layout/v2_quote_view_video_overlay_stub.xml
new file mode 100644
index 0000000000..35fe047043
--- /dev/null
+++ b/app/src/main/res/layout/v2_quote_view_video_overlay_stub.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2023 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  -->
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/quote_video_overlay"
+    android:layout_width="13dp"
+    android:layout_height="16dp"
+    android:importantForAccessibility="no"
+    app:srcCompat="@drawable/exo_icon_play_ultramarine" />
\ No newline at end of file