From: wolfgang <wolfgang@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Wed, 1 Aug 2007 21:55:33 +0000 (+0000)
Subject: git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1132 d1b88da0-ebda-0310... 
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfde332148ad83ce9a842844eb04992383923670;p=scalable-opengroupware.org

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

diff --git a/UI/MailerUI/UIxMailAccountActions.m b/UI/MailerUI/UIxMailAccountActions.m
index 472db88d..56b9a0d8 100644
--- 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 7ed9b7b2..67744030 100644
--- 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) +