diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 47d933dbc..831cef806 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -745,20 +745,17 @@ function newEmailTo(sender) {
 function expandUpperTree(node) {
   var currentNode = node.parentNode;
 
-  while (currentNode.className != "dtree")
-    {
-      if (currentNode.className == 'clip')
-        {
-          var id = currentNode.getAttribute("id");
-          var number = parseInt(id.substr(2));
-          if (number > 0)
-            {
-              var cn = d.aNodes[number];
-              d.nodeStatus(1, number, cn._ls);
-            }
-        }
+  while (currentNode.className != "dtree") {
+      if (currentNode.className == 'clip') {
+	 var id = currentNode.getAttribute("id");
+	 var number = parseInt(id.substr(2));
+	 if (number > 0) {
+	    var cn = d.aNodes[number];
+	    d.nodeStatus(1, number, cn._ls);
+	 }
+      }
       currentNode = currentNode.parentNode;
-    }
+  }
 }
 
 function initMailboxSelection(mailboxName) {
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index a699ee032..fec8322af 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -39,7 +39,7 @@ function newEvent(sender, type) {
   if (params.length > 0)
     urlstr += "?" + params.join("&");
 
-  window.open(urlstr, "", "width=490,height=600,resizable=0");
+  window.open(urlstr, "", "width=490,height=470,resizable=0");
 
   return false; /* stop following the link */
 }
@@ -53,7 +53,7 @@ function _editEventId(id, owner) {
   var urlstr = urlBase + id + "/edit";
 
   var win = window.open(urlstr, "SOGo_edit_" + id,
-                        "width=490,height=600,resizable=0");
+                        "width=490,height=470,resizable=0");
   win.focus();
 }
 
@@ -1062,7 +1062,7 @@ function appendCalendar(folderName, folder) {
       colorBox.style.backgroundColor = color + ";";
    }
    li.appendChild(colorBox);
-   li.appendChild(document.createTextNode(folderName));
+   li.appendChild(document.createTextNode(" " + folderName));
 
    calendarList.appendChild(li);