3 files changed, 25 insertions, 11 deletions
diff --git a/src/view/com/modals/AppealLabel.tsx b/src/view/com/modals/AppealLabel.tsx
index 2db070bc6..edc6f4cd0 100644
--- a/src/view/com/modals/AppealLabel.tsx
+++ b/src/view/com/modals/AppealLabel.tsx
@@ -62,17 +62,17 @@ export function Component(props: ReportComponentProps) {
       <Text
         type="2xl-bold"
         style={[pal.text, s.textCenter, {paddingBottom: 8}]}>
-        <Trans>Appeal Decision</Trans>
+        <Trans>Appeal Content Warning</Trans>
       </Text>
       <ScrollView>
         <View style={[pal.btn, styles.detailsInputContainer]}>
           <TextInput
             accessibilityLabel={_(msg`Text input field`)}
             accessibilityHint={_(
-              msg`Please tell us why you think this decision was incorrect.`,
+              msg`Please tell us why you think this content warning was incorrectly applied!`,
             )}
             placeholder={_(
-              msg`Please tell us why you think this decision was incorrect.`,
+              msg`Please tell us why you think this content warning was incorrectly applied!`,
             )}
             placeholderTextColor={pal.textLight.color}
             value={details}
diff --git a/src/view/com/post-thread/PostThreadItem.tsx b/src/view/com/post-thread/PostThreadItem.tsx
index e6adfc85b..2ff803071 100644
--- a/src/view/com/post-thread/PostThreadItem.tsx
+++ b/src/view/com/post-thread/PostThreadItem.tsx
@@ -42,7 +42,6 @@ import {useComposerControls} from '#/state/shell/composer'
 import {useModerationOpts} from '#/state/queries/preferences'
 import {Shadow, usePostShadow, POST_TOMBSTONE} from '#/state/cache/post-shadow'
 import {ThreadPost} from '#/state/queries/post-thread'
-import {LabelInfo} from '../util/moderation/LabelInfo'
 import {useSession} from '#/state/session'
 import {WhoCanReply} from '../threadgate/WhoCanReply'
 
@@ -335,6 +334,9 @@ let PostThreadItemLoaded = ({
               postCid={post.cid}
               postUri={post.uri}
               record={record}
+              showAppealLabelItem={
+                post.author.did === currentAccount?.did && !isSelfLabeledPost
+              }
               style={{
                 paddingVertical: 6,
                 paddingHorizontal: 10,
@@ -354,13 +356,6 @@ let PostThreadItemLoaded = ({
                 includeMute
                 style={styles.alert}
               />
-              {post.author.did === currentAccount?.did && !isSelfLabeledPost ? (
-                <LabelInfo
-                  details={{uri: post.uri, cid: post.cid}}
-                  labels={post.labels}
-                  style={{marginBottom: 8}}
-                />
-              ) : null}
               {richText?.text ? (
                 <View
                   style={[
diff --git a/src/view/com/util/forms/PostDropdownBtn.tsx b/src/view/com/util/forms/PostDropdownBtn.tsx
index 8c4b03dd9..193bb9bd7 100644
--- a/src/view/com/util/forms/PostDropdownBtn.tsx
+++ b/src/view/com/util/forms/PostDropdownBtn.tsx
@@ -31,6 +31,7 @@ let PostDropdownBtn = ({
   postUri,
   record,
   style,
+  showAppealLabelItem,
 }: {
   testID: string
   postAuthor: AppBskyActorDefs.ProfileViewBasic
@@ -38,6 +39,7 @@ let PostDropdownBtn = ({
   postUri: string
   record: AppBskyFeedPost.Record
   style?: StyleProp<ViewStyle>
+  showAppealLabelItem?: boolean
 }): React.ReactNode => {
   const {hasSession, currentAccount} = useSession()
   const theme = useTheme()
@@ -198,6 +200,23 @@ let PostDropdownBtn = ({
         web: ['far', 'trash-can'],
       },
     },
+    showAppealLabelItem && {
+      label: 'separator',
+    },
+    showAppealLabelItem && {
+      label: _(msg`Appeal content warning`),
+      onPress() {
+        openModal({name: 'appeal-label', uri: postUri, cid: postCid})
+      },
+      testID: 'postDropdownAppealBtn',
+      icon: {
+        ios: {
+          name: 'exclamationmark.triangle',
+        },
+        android: 'ic_menu_report_image',
+        web: 'circle-exclamation',
+      },
+    },
   ].filter(Boolean) as NativeDropdownItem[]
 
   return (