diff --git a/ChangeLog b/ChangeLog
index b6716ecdf..c818c7a58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2012-02-23  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Mailer/SOGoMailAccount.m
+	(-toManyRelationshipKeysWithNamespaces:): for some reason, we were
+	explicitly returning the drafts folder name in the batch whether
+	the corresponding folder exists or not, which is useless and
+	wrong since the folder in question might actually be a child of
+	another folder.
+
 	* OpenChange/MAPIStoreContext.m (-init): restored "containersBag"
 	mechanism where root context folders that are deeper than the
 	first level of their hierarchy needs to have their parent folders
diff --git a/SoObjects/Mailer/SOGoMailAccount.m b/SoObjects/Mailer/SOGoMailAccount.m
index 6a3bd5c24..448b7b2a4 100644
--- a/SoObjects/Mailer/SOGoMailAccount.m
+++ b/SoObjects/Mailer/SOGoMailAccount.m
@@ -182,7 +182,6 @@ static NSString *inboxFolderName = @"INBOX";
   imapFolders = [[self imap4Connection] subfoldersForURL: [self imap4URL]];
   folders = [imapFolders mutableCopy];
   [folders autorelease];
-  [folders addObjectUniquely: [self draftsFolderNameInContext: nil]];
   if (withNSs)
     [self _appendNamespaces: folders];
   else