From 7e3890af89aa9914230a39c16c0f0f0dc4f6b8da Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Wed, 7 Nov 2007 15:48:18 +0000
Subject: [PATCH] Monotone-Parent: 17b9d49a42aa59f70e7950234d2ea3206247df82
 Monotone-Revision: 38816d5f2c5865f939ccd8290226d22c43482e08

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-11-07T15:48:18
Monotone-Branch: ca.inverse.sogo
---
 UI/WebServerResources/MailerUI.js | 2 +-
 UI/WebServerResources/generic.js  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

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];
   }