diff --git a/lib/gitea-sync.js b/lib/gitea-sync.js
index a346d99..52747d2 100644
--- a/lib/gitea-sync.js
+++ b/lib/gitea-sync.js
@@ -562,7 +562,8 @@ class SyncManager {
                 const fullSig = SyncManager.combineSignature(srcHeader, footer);
                 await browser.identities.update(id, {
                     signature: fullSig,
-                    signatureIsPlainText: false
+                    signatureIsPlainText: false,
+                    attachSignature: false
                 });
                 loadedHeaders[email] = srcHeader;
                 updated++;
diff --git a/templates-reply-hotel.xpi b/templates-reply-hotel.xpi
index 3092204..1d4f9ae 100644
Binary files a/templates-reply-hotel.xpi and b/templates-reply-hotel.xpi differ
diff --git a/templates_options/templates_options.js b/templates_options/templates_options.js
index 6456c4c..7f63fd4 100644
--- a/templates_options/templates_options.js
+++ b/templates_options/templates_options.js
@@ -1198,6 +1198,20 @@ document.getElementById('sig-save-button').addEventListener('click', async () =>
     });
 
     if (identity) identity.signature = fullSignature;
+
+    // Update all identities that reference this email as source
+    for (const otherId of allIdentities) {
+        const otherSource = sourceMap[otherId.email.toLowerCase()] || 'own';
+        if (otherSource === `=${identity.email.toLowerCase()}`) {
+            await browser.identities.update(otherId.id, {
+                signature: fullSignature,
+                signatureIsPlainText: false,
+                attachSignature: false
+            });
+            otherId.signature = fullSignature;
+        }
+    }
+
     updateSigSyncIndicator();
 
     // Auto-push to server