diff --git a/app/(main)/[locale]/settings/page.tsx b/app/(main)/[locale]/settings/page.tsx
index db4f79ea..dee48ff7 100644
--- a/app/(main)/[locale]/settings/page.tsx
+++ b/app/(main)/[locale]/settings/page.tsx
@@ -199,11 +199,11 @@ const tabSearchPaths: Record<Tab, string[]> = {
     'settings.email_behavior.hover_actions',
     'settings.email_behavior.permanently_delete_junk',
     'settings.email_behavior.show_preview',
-    'settings.email_behavior.plain_text_mode',
   ],
   composing: [
     'settings.email_behavior.attachment_reminder',
     'settings.email_behavior.auto_select_reply_identity',
+    'settings.email_behavior.plain_text_mode',
     'settings.email_behavior.default_mail_program',
     'settings.email_behavior.signature_position',
     'settings.email_behavior.sub_address_delimiter',
diff --git a/components/settings/composing-settings.tsx b/components/settings/composing-settings.tsx
index 7646e488..bd9330ea 100644
--- a/components/settings/composing-settings.tsx
+++ b/components/settings/composing-settings.tsx
@@ -22,6 +22,7 @@ export function ComposingSettings() {
 
   const {
     autoSelectReplyIdentity,
+    plainTextMode,
     attachmentReminderEnabled,
     attachmentReminderKeywords,
     sendDelaySeconds,
@@ -44,6 +45,13 @@ export function ComposingSettings() {
         />
       </SettingItem>
 
+      <SettingItem label={t('plain_text_mode.label')} description={t('plain_text_mode.description')}>
+        <ToggleSwitch
+          checked={plainTextMode}
+          onChange={(checked) => updateSetting('plainTextMode', checked)}
+        />
+      </SettingItem>
+
       <SettingItem label={t('send_delay.label')} description={t('send_delay.description')}>
         <div className="flex flex-col items-end gap-1">
           <Select
diff --git a/components/settings/reading-settings.tsx b/components/settings/reading-settings.tsx
index 3aed858d..f74aa045 100644
--- a/components/settings/reading-settings.tsx
+++ b/components/settings/reading-settings.tsx
@@ -25,7 +25,6 @@ export function ReadingSettings() {
     showPreview,
     mailLayout,
     disableThreading,
-    plainTextMode,
     emailsPerPage,
     mailAttachmentAction,
     attachmentPosition,
@@ -194,13 +193,6 @@ export function ReadingSettings() {
         />
       </SettingItem>
 
-      <SettingItem label={t('plain_text_mode.label')} description={t('plain_text_mode.description')}>
-        <ToggleSwitch
-          checked={plainTextMode}
-          onChange={(checked) => updateSetting('plainTextMode', checked)}
-        />
-      </SettingItem>
-
       <SettingItem label={t('hide_inline_image_attachments.label')} description={t('hide_inline_image_attachments.description')}>
         <ToggleSwitch
           checked={hideInlineImageAttachments}