diff --git a/mozilla/mailnews/compose/resources/content/messengercompose.xul b/mozilla/mailnews/compose/resources/content/messengercompose.xul
index 3842624995a..a0a711764ac 100644
--- a/mozilla/mailnews/compose/resources/content/messengercompose.xul
+++ b/mozilla/mailnews/compose/resources/content/messengercompose.xul
@@ -66,7 +66,7 @@ Rights Reserved.
 	<broadcaster id="cmd_newNavigator"/>
 	<broadcaster id="cmd_newMessage"/>
 	<broadcaster id="cmd_newEditor"/>
-	<broadcaster id="cmd_close" oncommand="CloseWindow()"/>
+	<broadcaster id="cmd_close" oncommand="if (ComposeCanClose()) CloseWindow()"/>
 	<broadcaster id="cmd_attachFile" oncommand="AttachFile()"/>
 	<broadcaster id="cmd_selectAddress" oncommand="SelectAddress()"/>
 	<broadcaster id="cmd_sendNow" oncommand="SendMessage()"/>