diff --git a/mozilla/mailnews/compose/resources/content/MsgComposeCommands.js b/mozilla/mailnews/compose/resources/content/MsgComposeCommands.js
index b8ee32fb969..541ce25504c 100644
--- a/mozilla/mailnews/compose/resources/content/MsgComposeCommands.js
+++ b/mozilla/mailnews/compose/resources/content/MsgComposeCommands.js
@@ -1528,6 +1528,10 @@ function LoadIdentity(startup)
           
           if (needToCleanUp)
             awCleanupRows();
+
+          try {
+            msgCompose.SetSignature(currentIdentity);
+          } catch (ex) { dump("### Cannot set the signature: " + ex + "\n");}
         }
         
         //Setup autocomplete session, we can doit from here as it's use as a service