diff --git a/ChangeLog b/ChangeLog
index 698ce982c..da5ea98ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@
 
 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/Templates/SchedulerUI/UIxCalendarProperties.wox b/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
index 05b11c9e8..0e31355f3 100644
--- a/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
+++ b/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
@@ -52,13 +52,14 @@
               /></label></div>
 
         <var:if condition="mustSynchronize" const:negate="YES"
-          ><div><label><var:string
-                label:value="Tag:"/><input type="text"
+          ><div><span class="label"><var:string
+                label:value="Tag:"/></span
+              ><span class="content"><input type="text"
                 name="calendarSyncTag"
                 id="calendarSyncTag"
                 class="textField"
                 var:value="calendarSyncTag"
-                /></label
+                /></span
               ><var:if condition="synchronizeCalendar"><input type="hidden"
                 name="originalCalendarSyncTag"
                 id="originalCalendarSyncTag"
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) {
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index 133868f93..e1f044cb5 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -1972,7 +1972,7 @@ function onCalendarModify(event) {
     var url = ApplicationBaseURL + calendarID + "/properties";
     var windowID = sanitizeWindowName(calendarID + " properties");
     var width = 310;
-    var height = 260;
+    var height = 266;
     var isWebCalendar = false;
     if (UserSettings['Calendar'] 
         && UserSettings['Calendar']['WebCalendars']) {
@@ -1983,7 +1983,7 @@ function onCalendarModify(event) {
         }
     }
     if (isWebCalendar)
-        height += 25;
+        height += 21;
     else if (calendarID == "/personal")
         height -= 25;
 
diff --git a/UI/WebServerResources/UIxCalendarProperties.css b/UI/WebServerResources/UIxCalendarProperties.css
index c620352d5..790375430 100644
--- a/UI/WebServerResources/UIxCalendarProperties.css
+++ b/UI/WebServerResources/UIxCalendarProperties.css
@@ -11,23 +11,28 @@ FIELDSET
   border-top: 1px solid #909090;
   border-left: 1px solid #909090; }
 
+FIELDSET DIV
+{ margin-left: 20px;
+  margin-right: 10px; }
 
 SPAN.label
 { cursor: default;
-  width: 10em;
+  width: 60px;
   text-align: right;
-  padding-right: 1em;
   line-height: 2em;
   float: left;
   display: block; }
 
+INPUT.checkBox
+{ margin-left: 35px; }
+
 SPAN.content
 { display: block;
   line-height: 1.5em;
   vertical-align: middle; }
 
 SPAN.content INPUT.textField
-{ width: 50%; }
+{ width: 160px; }
 
 BUTTON#colorButton
 { display: none;
@@ -45,6 +50,9 @@ DIV#buttons
 INPUT#calendarSyncTag
 { width: 7em; }
 
+LABEL
+{ white-space: nowrap; }
+
 #webCalendarUrl SPAN.content
 { white-space: nowrap;
   overflow: hidden; }