2 files changed, 13 insertions, 13 deletions
diff --git a/src/screens/Messages/ChatList.tsx b/src/screens/Messages/ChatList.tsx
index 345446464..cb8598e79 100644
--- a/src/screens/Messages/ChatList.tsx
+++ b/src/screens/Messages/ChatList.tsx
@@ -74,7 +74,18 @@ export function MessagesScreen(props: Props) {
   return (
     <AgeRestrictedScreen
       screenTitle={_(msg`Chats`)}
-      infoText={aaCopy.chatsInfoText}>
+      infoText={aaCopy.chatsInfoText}
+      rightHeaderSlot={
+        <Link
+          to="/messages/settings"
+          label={_(msg`Chat settings`)}
+          size="small"
+          color="secondary">
+          <ButtonText>
+            <Trans>Chat settings</Trans>
+          </ButtonText>
+        </Link>
+      }>
       <MessagesScreenInner {...props} />
     </AgeRestrictedScreen>
   )
diff --git a/src/screens/Messages/Settings.tsx b/src/screens/Messages/Settings.tsx
index 6015c07cd..b4b84aafe 100644
--- a/src/screens/Messages/Settings.tsx
+++ b/src/screens/Messages/Settings.tsx
@@ -12,8 +12,6 @@ import {useSession} from '#/state/session'
 import * as Toast from '#/view/com/util/Toast'
 import {atoms as a} from '#/alf'
 import {Admonition} from '#/components/Admonition'
-import {AgeRestrictedScreen} from '#/components/ageAssurance/AgeRestrictedScreen'
-import {useAgeAssuranceCopy} from '#/components/ageAssurance/useAgeAssuranceCopy'
 import {Divider} from '#/components/Divider'
 import * as Toggle from '#/components/forms/Toggle'
 import * as Layout from '#/components/Layout'
@@ -25,16 +23,7 @@ type AllowIncoming = 'all' | 'none' | 'following'
 type Props = NativeStackScreenProps<CommonNavigatorParams, 'MessagesSettings'>
 
 export function MessagesSettingsScreen(props: Props) {
-  const {_} = useLingui()
-  const aaCopy = useAgeAssuranceCopy()
-
-  return (
-    <AgeRestrictedScreen
-      screenTitle={_(msg`Chat Settings`)}
-      infoText={aaCopy.chatsInfoText}>
-      <MessagesSettingsScreenInner {...props} />
-    </AgeRestrictedScreen>
-  )
+  return <MessagesSettingsScreenInner {...props} />
 }
 
 export function MessagesSettingsScreenInner({}: Props) {