Monotone-Parent: 4f12ba210dcd4149e7496ee80e06c65b94793dd3

Monotone-Revision: 7db08f6967ccc793434ea22058755fb137e85d45

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-11-01T12:48:19
Monotone-Branch: ca.inverse.sogo

UI/MailerUI/UIxMailFolderActions.m

@@ -140,7 +140,7 @@
   trashFolderName
     = [[co mailAccountFolder] trashFolderNameInContext: context];
   path = [NSString stringWithFormat: @"/%@/%@",
-		   [trashFolderName substringFromIndex: 6], folderName];
+		   trashFolderName, folderName];
   destURL = [[NSURL alloc] initWithScheme: [srcURL scheme]
 			   host: [srcURL host] path: path];
   [destURL autorelease];
@@ -193,7 +193,7 @@
 	  [mailSettings autorelease];
 	}
       [ud setObject: mailSettings forKey: @"Mail"];
-      [mailSettings setObject: [co relativeImap4Name]
+      [mailSettings setObject: [co traversalFromMailAccount]
 		    forKey: [NSString stringWithFormat: @"%@Folder",
 				      purpose]];
       [ud synchronize];