diff --git a/mozilla/mailnews/base/resources/content/mailOverlay.xul b/mozilla/mailnews/base/resources/content/mailOverlay.xul
index 9d704e9cb83..83b0885ce63 100644
--- a/mozilla/mailnews/base/resources/content/mailOverlay.xul
+++ b/mozilla/mailnews/base/resources/content/mailOverlay.xul
@@ -17,6 +17,13 @@
 
     function goOpenNewMessage()
       {
+	try {
+		MsgNewMessage();
+		return;
+	}
+	catch(ex) {
+	;
+	}
       	var msgComposeService = Components.classes["component://netscape/messengercompose"].getService(); 
       	msgComposeService = msgComposeService.QueryInterface(Components.interfaces.nsIMsgComposeService); 
         msgComposeService.OpenComposeWindow(null, null,
@@ -38,4 +45,4 @@
   	<key id="key_newMessage" xulkey="true" key="&newMessageCmd.key;" observes="cmd_newMessage"/>
   </keyset>
          
-</overlay>
\ No newline at end of file
+</overlay>
diff --git a/mozilla/mailnews/base/resources/content/mailWindowOverlay.js b/mozilla/mailnews/base/resources/content/mailWindowOverlay.js
index 50b9cfc9d82..d6654d5bc9b 100644
--- a/mozilla/mailnews/base/resources/content/mailWindowOverlay.js
+++ b/mozilla/mailnews/base/resources/content/mailWindowOverlay.js
@@ -111,7 +111,7 @@ function MsgNewMessage(event)
   var loadedFolder = GetFirstSelectedMsgFolder();
   var messageArray = GetSelectedMessages();
 
-  if (event.shiftKey)
+  if (event && event.shiftKey)
     ComposeMessage(msgComposeType.New, msgComposeFormat.OppositeOfDefault, loadedFolder, messageArray);
   else
     ComposeMessage(msgComposeType.New, msgComposeFormat.Default, loadedFolder, messageArray);