1 files changed, 5 insertions, 0 deletions
diff --git a/src/composewindow.cpp b/src/composewindow.cpp
index 94a3f46..d781e52 100644
--- a/src/composewindow.cpp
+++ b/src/composewindow.cpp
@@ -792,6 +792,11 @@ void ComposeWindow::seedSignature()
     // verbatim. Seeding again would append a second one.
     if (m_context.kind == ComposeContext::Kind::Draft) {
         none->setChecked(true);
+        // The draft IS the user's choice: its signature is deliberate prior
+        // state, so a From: change must not follow the new account and
+        // rewrite what was saved. Marking it chosen keeps the same invariant
+        // the switch actions set, without ever having run the switch.
+        m_signatureChosen = true;
         return;
     }