git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1132 d1b88da0-ebda-0310...

diff --git a/UI/MailerUI/UIxMailAccountActions.m b/UI/MailerUI/UIxMailAccountActions.m
index 472db88d5d4e083feb72702b40021c4800def386..56b9a0d8771f805dd3d787f974b6adf2225784d3 100644 (file)
--- a/UI/MailerUI/UIxMailAccountActions.m
+++ b/UI/MailerUI/UIxMailAccountActions.m
@@ -92,9 +92,12 @@
   WOResponse *response;
 
   co = [self clientObject];
-  draftFolderName = [co draftsFolderNameInContext: context];
-  sentFolderName = [co sentFolderNameInContext: context];
-  trashFolderName = [co trashFolderNameInContext: context];
+  draftFolderName = [[co draftsFolderNameInContext: context]
+                     substringFromIndex: 6];
+  sentFolderName = [[co sentFolderNameInContext: context]
+                    substringFromIndex: 6];
+  trashFolderName = [[co trashFolderNameInContext: context]
+                     substringFromIndex: 6];
 
   rawFolders = [co allFolderPaths];
   folders = [self _jsonFolders: [rawFolders objectEnumerator]];

diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js
index 7ed9b7b2d804e330e1569d72ada4adbf08324f20..6774403010c4da56aa313b4f664d468ba90a4bb2 100644 (file)
--- a/UI/WebServerResources/ContactsUI.js
+++ b/UI/WebServerResources/ContactsUI.js
@@ -31,7 +31,7 @@ function validateEditorInput(sender) {
 }
 
 function openContactsFolder(contactsFolder, reload, idx) {
-  if ((currentContactFolder && contactsFolder != currentContactFolder)
+  if ((contactsFolder && contactsFolder != currentContactFolder)
       || reload) {
      currentContactFolder = contactsFolder; log("openContactsFolder " + contactsFolder);
      var url = URLForFolderID(currentContactFolder) +