diff --git a/kmcomposewin.cpp b/kmcomposewin.cpp
index ec533ad58..110eee829 100644
--- a/kmcomposewin.cpp
+++ b/kmcomposewin.cpp
@@ -3334,7 +3334,7 @@ void KMComposeWin::setEncryption( bool encrypt, bool setByUser )
                                "in the identity configuration.</p>"
                                "</qt>"),
                           i18n("Undefined Encryption Key") );
-      setModified(wasModified);
+      setModified( wasModified );
     }
     encrypt = false;
   }
@@ -3371,6 +3371,7 @@ void KMComposeWin::slotSignToggled( bool on )
 //-----------------------------------------------------------------------------
 void KMComposeWin::setSigning( bool sign, bool setByUser )
 {
+  bool wasModified = isModified();
   if ( setByUser ) {
     setModified( true );
   }
@@ -3390,6 +3391,7 @@ void KMComposeWin::setSigning( bool sign, bool setByUser )
                                "in the identity configuration.</p>"
                                "</qt>"),
                           i18n("Undefined Signing Key") );
+      setModified( wasModified );
     }
     sign = false;
   }