From 20dadea2dd7a69adbb6867ad483a4fbef801587c Mon Sep 17 00:00:00 2001
From: andreawoe <aw@vnc.biz>
Date: Sun, 23 Aug 2026 19:21:55 +0200
Subject: [PATCH] fix(signatures): place reply/forward signature above the
 quote by default

---
 stores/settings-store.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/stores/settings-store.ts b/stores/settings-store.ts
index 1b6a8aa6..dcdfa81a 100644
--- a/stores/settings-store.ts
+++ b/stores/settings-store.ts
@@ -490,7 +490,7 @@ const DEFAULT_SETTINGS = {
   rtlEditingSupport: false,
   subAddressDelimiter: DEFAULT_SUB_ADDRESS_DELIMITER,
   sendDelaySeconds: 0 as SendDelaySeconds,
-  signaturePosition: 'below_quote' as SignaturePosition,
+  signaturePosition: 'above_quote' as SignaturePosition,
   signatureSeparatorEnabled: true,
   requestReadReceiptDefault: false,
   readReceiptResponse: 'ask' as ReadReceiptResponse,
@@ -998,7 +998,7 @@ export const useSettingsStore = create<SettingsState>()(
     }),
     {
       name: 'settings-storage',
-      version: 7,
+      version: 8,
       migrate: migrateSettings,
       onRehydrateStorage: () => {
         return (state) => {
@@ -1085,6 +1085,12 @@ export function migrateSettings(persisted: unknown, version: number): SettingsSt
         if (version < 6 || !isPlainRecord(state.preferredIdentityIds)) {
           state.preferredIdentityIds = {};
         }
+        // v8: reply/forward signatures now sit above the quoted message by
+        // default (previously below). Migrate any persisted value so existing
+        // accounts pick up the new default.
+        if (version < 8) {
+          state.signaturePosition = 'above_quote';
+        }
         return state as unknown as SettingsState;
 }