diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 71dbdb064..cc8446805 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -1176,7 +1176,7 @@ function initMailboxTree() {
   mailboxTree.pendingRequests = mailAccounts.length;
   activeAjaxRequests += mailAccounts.length;
   for (var i = 0; i < mailAccounts.length; i++) {
-    var url = ApplicationBaseURL + "/" + mailAccounts[i] + "/mailboxes";
+    var url = ApplicationBaseURL + mailAccounts[i] + "/mailboxes";
     triggerAjaxRequest(url, onLoadMailboxesCallback, mailAccounts[i]);
   }
 }
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 1d98fe3b4..47c097531 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -150,7 +150,8 @@ function URLForFolderID(folderID) {
   var url;
   if (folderInfos.length > 1) {
     url = UserFolderURL + "../" + folderInfos[0];
-    if (!folderInfos[1].startsWith('/'))
+    if (!(folderInfos[0].endsWith('/')
+	  || folderInfos[1].startsWith('/')))
       url += '/';
     url += folderInfos[1];
   }