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 8eb7cfdc4b..ed7b8840a8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java
@@ -153,8 +153,8 @@ public class InputPanel extends ConstraintLayout
 
     this.composeContainer       = findViewById(R.id.compose_bubble);
     this.stickerSuggestion      = findViewById(R.id.input_panel_sticker_suggestion);
-    this.quoteViewStub          = new Stub<>(findViewById(R.id.quote_view_stub));
-    this.linkPreviewStub        = new Stub<>(findViewById(R.id.link_preview_stub));
+    this.quoteViewStub          = new Stub<>(findViewById(R.id.quote_view));
+    this.linkPreviewStub        = new Stub<>(findViewById(R.id.link_preview));
     this.mediaKeyboard          = findViewById(R.id.emoji_toggle);
     this.composeText            = findViewById(R.id.embedded_text_editor);
     this.composeTextContainer   = findViewById(R.id.embedded_text_editor_container);
diff --git a/app/src/main/res/layout/conversation_input_panel.xml b/app/src/main/res/layout/conversation_input_panel.xml
index 5a230cadcc..91585820d8 100644
--- a/app/src/main/res/layout/conversation_input_panel.xml
+++ b/app/src/main/res/layout/conversation_input_panel.xml
@@ -88,7 +88,7 @@
         tools:visibility="visible" />
 
     <ViewStub
-        android:id="@+id/quote_view_stub"
+        android:id="@+id/quote_view"
         android:inflatedId="@+id/quote_view"
         android:layout="@layout/conversation_input_quote_view"
         android:layout_width="0dp"
@@ -100,7 +100,7 @@
         app:layout_constraintTop_toBottomOf="@+id/edit_message_title" />
 
     <ViewStub
-        android:id="@+id/link_preview_stub"
+        android:id="@+id/link_preview"
         android:inflatedId="@+id/link_preview"
         android:layout="@layout/conversation_input_link_preview_view"
         android:layout_width="0dp"