diff --git a/src/view/com/composer/Composer.tsx b/src/view/com/composer/Composer.tsx
index 971322148..e351650af 100644
--- a/src/view/com/composer/Composer.tsx
+++ b/src/view/com/composer/Composer.tsx
@@ -293,7 +293,7 @@ export const ComposePost = ({
   recoveredState,
   activeAccountDid: initialActiveAccountDid,
   openAccountSwitcher = false,
-  replyTo,
+  replyTo: initialReplyTo,
   onPost,
   onPostSuccess,
   quote: initQuote,
@@ -308,6 +308,7 @@ export const ComposePost = ({
 }: Props & {
   cancelRef?: RefObject<CancelRef | null>
 }) => {
+  const [replyTo, setReplyTo] = useState(initialReplyTo)
   const {accounts, currentAccount} = useSession()
   const t = useTheme()
   const ax = useAnalytics()
@@ -863,6 +864,40 @@ export const ComposePost = ({
         draftId: draftSummary.id,
       })
 
+      let restoredReplyTo: ComposerOpts['replyTo']
+      const replyToUri = (draftSummary.draft as {replyToUri?: unknown})
+        .replyToUri
+      if (replyToUri !== undefined) {
+        try {
+          if (
+            typeof replyToUri !== 'string' ||
+            !replyToUri.startsWith('at://')
+          ) {
+            throw new Error('Invalid draft reply target')
+          }
+          const {posts} = await client.call(app.bsky.feed.getPosts, {
+            uris: [replyToUri as AtUriString],
+          })
+          const target = posts[0]
+          if (!target || !bsky.isType(app.bsky.feed.post, target.record)) {
+            throw new Error('Draft reply target unavailable')
+          }
+          restoredReplyTo = {
+            uri: target.uri,
+            cid: target.cid,
+            text: target.record.text,
+            langs: target.record.langs,
+            author: target.author,
+            embed: target.embed,
+          }
+        } catch {
+          setError(
+            l`Could not load the post this draft replies to. Please try again later.`,
+          )
+          return
+        }
+      }
+
       // Load local media files for the draft
       const {loadedMedia} = await loadDraftMedia(draftSummary.draft)
 
@@ -881,6 +916,10 @@ export const ComposePost = ({
         loadedMedia,
       )
 
+      setError('')
+      setReplyTo(restoredReplyTo)
+      setReplyToLanguages(restoredReplyTo?.langs ?? [])
+
       // Dispatch restore action (this also sets draftId in state)
       composerDispatch({
         type: 'restore_from_draft',
@@ -914,7 +953,7 @@ export const ComposePost = ({
         void restoreVideo(postId, videoInfo)
       }
     },
-    [composerDispatch, restoreVideo, ax],
+    [composerDispatch, restoreVideo, ax, client, l],
   )
 
   const [publishOnUpload, setPublishOnUpload] = useState(false)
@@ -965,6 +1004,7 @@ export const ComposePost = ({
       const result = await saveDraft({
         composerState,
         existingDraftId: composerState.draftId,
+        replyToUri: replyTo?.uri,
       })
       composerDispatch({type: 'mark_saved', draftId: result.draftId})
 
@@ -993,6 +1033,7 @@ export const ComposePost = ({
     }
   }, [
     saveDraft,
+    replyTo,
     composerState,
     composerDispatch,
     onClose,
@@ -1013,6 +1054,7 @@ export const ComposePost = ({
       const result = await saveDraft({
         composerState,
         existingDraftId: composerState.draftId,
+        replyToUri: replyTo?.uri,
       })
       composerDispatch({type: 'mark_saved', draftId: result.draftId})
       return {success: true}
@@ -1022,6 +1064,7 @@ export const ComposePost = ({
     }
   }, [
     saveDraft,
+    replyTo,
     composerState,
     composerDispatch,
     validateDraftTextOrError,
@@ -1065,6 +1108,8 @@ export const ComposePost = ({
 
   // Clear the composer (discard current content)
   const handleClearComposer = useCallback(() => {
+    setReplyTo(undefined)
+    setReplyToLanguages([])
     composerDispatch({
       type: 'clear',
       initInteractionSettings: preferences?.postInteractionSettings,
@@ -1848,63 +1893,52 @@ export const ComposePost = ({
           {!IS_WEBFooterSticky && footer}
         </View>
 
-        {replyTo ? (
-          <Prompt.Basic
-            control={discardPromptControl}
-            title={l`Discard draft?`}
-            description=""
-            confirmButtonCta={l`Discard`}
-            confirmButtonColor="negative"
-            onConfirm={handleDiscard}
-          />
-        ) : (
-          <Prompt.Outer control={discardPromptControl}>
-            <Prompt.Content>
-              <Prompt.TitleText>
-                {allPostsWithinLimit ? (
-                  composerState.draftId ? (
-                    <Trans>Save changes?</Trans>
-                  ) : (
-                    <Trans>Save draft?</Trans>
-                  )
+        <Prompt.Outer control={discardPromptControl}>
+          <Prompt.Content>
+            <Prompt.TitleText>
+              {allPostsWithinLimit ? (
+                composerState.draftId ? (
+                  <Trans>Save changes?</Trans>
                 ) : (
-                  <Trans>Discard post?</Trans>
-                )}
-              </Prompt.TitleText>
-              <Prompt.DescriptionText>
-                {allPostsWithinLimit ? (
-                  composerState.draftId ? (
-                    <Trans>
-                      You have unsaved changes to this draft, would you like to
-                      save them?
-                    </Trans>
-                  ) : (
-                    <Trans>
-                      Would you like to save this as a draft to edit later?
-                    </Trans>
-                  )
+                  <Trans>Save draft?</Trans>
+                )
+              ) : (
+                <Trans>Discard post?</Trans>
+              )}
+            </Prompt.TitleText>
+            <Prompt.DescriptionText>
+              {allPostsWithinLimit ? (
+                composerState.draftId ? (
+                  <Trans>
+                    You have unsaved changes to this draft, would you like to
+                    save them?
+                  </Trans>
                 ) : (
-                  <Trans>You can only save drafts up to 1000 characters.</Trans>
-                )}
-              </Prompt.DescriptionText>
-            </Prompt.Content>
-            <Prompt.Actions>
-              {allPostsWithinLimit && (
-                <Prompt.Action
-                  cta={composerState.draftId ? l`Save changes` : l`Save draft`}
-                  onPress={() => void handleSaveDraft()}
-                  color="primary"
-                />
+                  <Trans>
+                    Would you like to save this as a draft to edit later?
+                  </Trans>
+                )
+              ) : (
+                <Trans>You can only save drafts up to 1000 characters.</Trans>
               )}
-              <Prompt.Cancel cta={l`Keep editing`} />
+            </Prompt.DescriptionText>
+          </Prompt.Content>
+          <Prompt.Actions>
+            {allPostsWithinLimit && (
               <Prompt.Action
-                cta={l`Discard`}
-                onPress={handleDiscard}
-                color="negative_subtle"
+                cta={composerState.draftId ? l`Save changes` : l`Save draft`}
+                onPress={() => void handleSaveDraft()}
+                color="primary"
               />
-            </Prompt.Actions>
-          </Prompt.Outer>
-        )}
+            )}
+            <Prompt.Cancel cta={l`Keep editing`} />
+            <Prompt.Action
+              cta={l`Discard`}
+              onPress={handleDiscard}
+              color="negative_subtle"
+            />
+          </Prompt.Actions>
+        </Prompt.Outer>
 
         <Prompt.Basic
           control={emptyPostsPromptControl}
@@ -2297,18 +2331,16 @@ function ComposerTopBar({
           </>
         ) : (
           <>
-            {!isReply && (
-              <DraftsButton
-                onSelectDraft={onSelectDraft}
-                onSaveDraft={onSaveDraft}
-                onDiscard={onDiscard}
-                isEmpty={isEmpty}
-                isDirty={isDirty}
-                isEditingDraft={isEditingDraft}
-                canSaveDraft={canSaveDraft}
-                textLength={textLength}
-              />
-            )}
+            <DraftsButton
+              onSelectDraft={onSelectDraft}
+              onSaveDraft={onSaveDraft}
+              onDiscard={onDiscard}
+              isEmpty={isEmpty}
+              isDirty={isDirty}
+              isEditingDraft={isEditingDraft}
+              canSaveDraft={canSaveDraft}
+              textLength={textLength}
+            />
             <Button
               testID="composerPublishBtn"
               label={
diff --git a/src/view/com/composer/drafts/DraftItem.tsx b/src/view/com/composer/drafts/DraftItem.tsx
index f8918227b..154f92339 100644
--- a/src/view/com/composer/drafts/DraftItem.tsx
+++ b/src/view/com/composer/drafts/DraftItem.tsx
@@ -1,8 +1,8 @@
 import {useCallback, useEffect, useMemo, useState} from 'react'
 import {View} from 'react-native'
 import * as VideoThumbnails from 'expo-video-thumbnails'
-import {msg, plural} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
+import {plural} from '@lingui/core/macro'
+import {useLingui} from '@lingui/react/macro'
 
 import * as device from '#/lib/deviceName'
 import {logger} from '#/view/com/composer/drafts/state/logger'
@@ -13,6 +13,7 @@ import {CirclePlus_Stroke2_Corner0_Rounded as CirclePlusIcon} from '#/components
 import {type Props as SVGIconProps} from '#/components/icons/common'
 import {DotGrid3x1_Stroke2_Corner0_Rounded as DotsIcon} from '#/components/icons/DotGrid'
 import {CloseQuote_Stroke2_Corner0_Rounded as CloseQuoteIcon} from '#/components/icons/Quote'
+import {Reply as ReplyIcon} from '#/components/icons/Reply'
 import {Warning_Stroke2_Corner0_Rounded as WarningIcon} from '#/components/icons/Warning'
 import * as MediaPreview from '#/components/MediaPreview'
 import {Pressable} from '#/components/Pressable'
@@ -32,16 +33,19 @@ export function DraftItem({
   onSelect: (draft: DraftSummary) => void
   onDelete: (draft: DraftSummary) => void
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const discardPromptControl = Prompt.usePromptControl()
   const post = draft.posts[0]
+  const isReply =
+    typeof (draft.draft as {replyToUri?: unknown}).replyToUri === 'string'
 
   const mediaExistsOnOtherDevice =
     !draft.meta.isOriginatingDevice && draft.meta.hasMissingMedia
   const mediaIsMissing =
     draft.meta.isOriginatingDevice && draft.meta.hasMissingMedia
   const hasMetadata =
+    isReply ||
     draft.meta.replyCount > 0 ||
     mediaExistsOnOtherDevice ||
     draft.meta.hasQuotes
@@ -67,8 +71,8 @@ export function DraftItem({
       <View style={[a.relative]}>
         <Pressable
           accessibilityRole="button"
-          accessibilityLabel={_(msg`Open draft`)}
-          accessibilityHint={_(msg`Opens this draft in the composer`)}
+          accessibilityLabel={l`Open draft`}
+          accessibilityHint={l`Opens this draft in the composer`}
           onPress={() => onSelect(draft)}
           style={({pressed, hovered}) => [
             a.rounded_md,
@@ -127,13 +131,11 @@ export function DraftItem({
                     icon={WarningIcon}
                     text={
                       isUnknownDevice
-                        ? _(msg`Media stored on another device`)
-                        : _(
-                            msg({
-                              message: `Media stored on ${draft.draft.deviceName}`,
-                              comment: `Example: "Media stored on John's iPhone"`,
-                            }),
-                          )
+                        ? l`Media stored on another device`
+                        : l({
+                            message: `Media stored on ${draft.draft.deviceName}`,
+                            comment: `Example: "Media stored on John's iPhone"`,
+                          })
                     }
                   />
                 )}
@@ -141,13 +143,22 @@ export function DraftItem({
                   <DraftMetadataTag
                     display="warning"
                     icon={WarningIcon}
-                    text={_(msg`Missing media`)}
+                    text={l`Missing media`}
+                  />
+                )}
+                {isReply && (
+                  <DraftMetadataTag
+                    icon={ReplyIcon}
+                    text={l({
+                      message: 'Reply',
+                      comment: 'A draft that replies to another post.',
+                    })}
                   />
                 )}
                 {draft.meta.hasQuotes && (
                   <DraftMetadataTag
                     icon={CloseQuoteIcon}
-                    text={_(msg`Quote post`)}
+                    text={l`Quote post`}
                   />
                 )}
                 {draft.meta.replyCount > 0 && (
@@ -200,7 +211,7 @@ export function DraftItem({
             },
           ]}>
           <Button
-            label={_(msg`More options`)}
+            label={l`More options`}
             hitSlop={8}
             onPress={e => {
               e.stopPropagation()
@@ -249,10 +260,10 @@ export function DraftItem({
 
       <Prompt.Basic
         control={discardPromptControl}
-        title={_(msg`Discard draft?`)}
-        description={_(msg`This draft will be permanently deleted.`)}
+        title={l`Discard draft?`}
+        description={l`This draft will be permanently deleted.`}
         onConfirm={handleDelete}
-        confirmButtonCta={_(msg`Discard`)}
+        confirmButtonCta={l`Discard`}
         confirmButtonColor="negative"
       />
     </>
diff --git a/src/view/com/composer/drafts/state/api.ts b/src/view/com/composer/drafts/state/api.ts
index 0e4b64285..74c72f431 100644
--- a/src/view/com/composer/drafts/state/api.ts
+++ b/src/view/com/composer/drafts/state/api.ts
@@ -83,6 +83,7 @@ function parseVideoMimeType(localRefPath: string): string {
 export async function composerStateToDraft(
   clients: LinkResolvers,
   state: ComposerState,
+  replyToUri?: string,
 ): Promise<{
   draft: app.bsky.draft.defs.Draft
   localRefPaths: Map<string, string>
@@ -100,6 +101,8 @@ export async function composerStateToDraft(
     deviceId: getDeviceId(),
     deviceName: getDeviceName().slice(0, 100), // max length of 100 in lex
     posts,
+    // Preserve the reply target in an extra field until the draft lexicon supports it.
+    ...(replyToUri ? {replyToUri} : {}),
     threadgateAllow: threadgateAllowUISettingToAllowRecordValue(
       state.thread.threadgate,
     ),
diff --git a/src/view/com/composer/drafts/state/queries.ts b/src/view/com/composer/drafts/state/queries.ts
index b46637bc0..ac0e963df 100644
--- a/src/view/com/composer/drafts/state/queries.ts
+++ b/src/view/com/composer/drafts/state/queries.ts
@@ -143,9 +143,11 @@ export function useSaveDraftMutation() {
     mutationFn: async ({
       composerState,
       existingDraftId,
+      replyToUri,
     }: {
       composerState: ComposerState
       existingDraftId?: string
+      replyToUri?: string
     }): Promise<{
       draftId: string
       localRefPaths: Map<string, string>
@@ -155,6 +157,7 @@ export function useSaveDraftMutation() {
       const {draft: apiDraft, localRefPaths} = await composerStateToDraft(
         {appviewClient: client, chatClient},
         composerState,
+        replyToUri,
       )
       const draft = apiDraft