diff --git a/ChangeLog b/ChangeLog
index f35aa52e6..b968d3114 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-01-22  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/WebServerResources/MailerUI.js (composeNewMessage): fixed
+	potential js error in IE when no mailbox is selected.
+
 	* Tools/SOGoToolRestore.m (+initialize): we need to invoke
 	[iCalEntityObject+SOGo initializeSOGoExtensions], otherwise the
 	extraction of quick records will cause a crash because some global
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index cbb7959e1..278651808 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -575,9 +575,17 @@ function onComposeMessage() {
 }
 
 function composeNewMessage() {
-    var account = Mailer.currentMailbox.split("/")[1];
-    var url = ApplicationBaseURL + "/" + encodeURI(account) + "/compose";
-    openMailComposeWindow(url);
+    var account;
+    if (Mailer.currentMailbox)
+        account = Mailer.currentMailbox.split("/")[1];
+    else if (mailAccounts.length)
+        account = mailAccounts[0][0];
+    else
+        account = null;
+    if (account) {
+        var url = ApplicationBaseURL + "/" + encodeURI(account) + "/compose";
+        openMailComposeWindow(url);
+    }
 }
 
 function openMailbox(mailbox, reload, idx, updateStatus) {