diff --git a/ChangeLog b/ChangeLog
index fa081da99..fae7dc4be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-11-21  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/Mailer/SOGoMailAccount.m ([SOGoMailAccount
+	-lookupFolder:ofClassNamed:inContext:]): added the ability to
+	configure the name of the SOGoDraftFolders with the ud var
+	"SOGoDraftsFolderName".
+
 2006-11-17  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/SOGo/SOGoObject.m ([SOGoObject
diff --git a/SoObjects/Mailer/SOGoMailAccount.m b/SoObjects/Mailer/SOGoMailAccount.m
index aee34c264..d4ddbdcbd 100644
--- a/SoObjects/Mailer/SOGoMailAccount.m
+++ b/SoObjects/Mailer/SOGoMailAccount.m
@@ -43,6 +43,7 @@ static BOOL     useAltNamespace       = NO;
 
 + (void)initialize {
   NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+  NSString *cfgDraftsFolderName;
 
   NSAssert2([super version] == 1,
             @"invalid superclass (%@) version %i !",
@@ -52,10 +53,15 @@ static BOOL     useAltNamespace       = NO;
   
   sharedFolderName     = [ud stringForKey:@"SOGoSharedFolderName"];
   otherUsersFolderName = [ud stringForKey:@"SOGoOtherUsersFolderName"];
-  
+  cfgDraftsFolderName = [ud stringForKey:@"SOGoDraftsFolderName"];
+  if ([cfgDraftsFolderName length] > 0)
+    {
+      ASSIGN (draftsFolderName, cfgDraftsFolderName);
+      NSLog(@"Note: using drafts folder named:      '%@'", draftsFolderName);
+    }
+
   NSLog(@"Note: using shared-folders name:      '%@'", sharedFolderName);
   NSLog(@"Note: using other-users-folders name: '%@'", otherUsersFolderName);
-  
   if ([ud boolForKey:@"SOGoEnableSieveFolder"]) {
     rootFolderNames = [[NSArray alloc] initWithObjects:
 				        draftsFolderName,