diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 3946d4623..34174251e 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -5763,6 +5763,10 @@
     "messageformat": "There was an error when saving your settings. Please try again.",
     "description": "Shown if there is an error when saving your preferred reaction settings. Should be very rare to see this message."
   },
+  "icu:MediaEditor__input-placeholder": {
+    "messageformat": "Message",
+    "description": "Placeholder for the input in the media editor"
+  },
   "icu:MediaEditor__clock-more-styles": {
     "messageformat": "More styles",
     "description": "Action button for switching up the clock styles"
diff --git a/stylesheets/components/MediaEditor.scss b/stylesheets/components/MediaEditor.scss
index 2796073c8..f318edd27 100644
--- a/stylesheets/components/MediaEditor.scss
+++ b/stylesheets/components/MediaEditor.scss
@@ -127,7 +127,7 @@
 
     &--input {
       margin-inline: 24px;
-      min-width: 400px;
+      width: 400px;
     }
 
     &--buttons {
diff --git a/ts/components/MediaEditor.tsx b/ts/components/MediaEditor.tsx
index 9d5357027..bb94e8784 100644
--- a/ts/components/MediaEditor.tsx
+++ b/ts/components/MediaEditor.tsx
@@ -1,10 +1,17 @@
 // Copyright 2021 Signal Messenger, LLC
 // SPDX-License-Identifier: AGPL-3.0-only
 
-import React, { useCallback, useEffect, useRef, useState } from 'react';
+import React, {
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from 'react';
 import classNames from 'classnames';
 import { createPortal } from 'react-dom';
 import { fabric } from 'fabric';
+import { useSelector } from 'react-redux';
 import { get, has, noop } from 'lodash';
 
 import type {
@@ -49,6 +56,8 @@ import { Theme } from '../util/theme';
 import { ThemeType } from '../types/Util';
 import { arrow } from '../util/keyboard';
 import { canvasToBytes } from '../util/canvasToBytes';
+import { getConversationSelector } from '../state/selectors/conversations';
+import { hydrateRanges } from '../types/BodyRange';
 import { useConfirmDiscard } from '../hooks/useConfirmDiscard';
 import { useFabricHistory } from '../mediaEditor/useFabricHistory';
 import { usePortal } from '../hooks/usePortal';
@@ -175,6 +184,12 @@ export function MediaEditor({
     DraftBodyRanges | undefined
   >(draftBodyRanges);
 
+  const conversationSelector = useSelector(getConversationSelector);
+  const hydratedBodyRanges = useMemo(
+    () => hydrateRanges(captionBodyRanges, conversationSelector),
+    [captionBodyRanges, conversationSelector]
+  );
+
   const inputApiRef = useRef<InputApi | undefined>();
 
   const closeEmojiPickerAndFocusComposer = useCallback(() => {
@@ -1285,8 +1300,8 @@ export function MediaEditor({
             <div className="MediaEditor__tools-row-2">
               <div className="MediaEditor__tools--input dark-theme">
                 <CompositionInput
-                  draftText={draftText}
-                  draftBodyRanges={draftBodyRanges}
+                  draftText={caption}
+                  draftBodyRanges={hydratedBodyRanges}
                   getPreferredBadge={getPreferredBadge}
                   i18n={i18n}
                   inputApi={inputApiRef}
@@ -1302,11 +1317,9 @@ export function MediaEditor({
                     setCaption(messageText);
                   }}
                   onPickEmoji={onPickEmoji}
-                  onSubmit={() => {
-                    inputApiRef.current?.reset();
-                  }}
+                  onSubmit={noop}
                   onTextTooLong={onTextTooLong}
-                  placeholder="Message"
+                  placeholder={i18n('icu:MediaEditor__input-placeholder')}
                   platform={platform}
                   sendCounter={0}
                   sortedGroupMembers={sortedGroupMembers}