diff --git a/ChangeLog b/ChangeLog
index ee5eaabb1..a31110bb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-27  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* SoObjects/Mailer/SOGoDraftObject.m (-save): we no longer use the
+	relative URL of the draft folder when it must be created. This
+	fixes an issue when using a subfolder as the drafts folder.
+
 2011-01-26  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/Scheduler/UIxComponentEditor.m (-setComponent:): retrieve the
diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m
index 420a9d387..4d6754aff 100644
--- a/SoObjects/Mailer/SOGoDraftObject.m
+++ b/SoObjects/Mailer/SOGoDraftObject.m
@@ -436,7 +436,8 @@ static NSString    *userAgent      = nil;
 
   if (![imap4 doesMailboxExistAtURL: [container imap4URL]])
     {
-      [client create: [container relativeImap4Name]];
+      [[self imap4Connection] createMailbox: [[self imap4Connection] imap4FolderNameForURL: [container imap4URL]]
+				      atURL: [[self mailAccountFolder] imap4URL]];
       [imap4 flushFolderHierarchyCache];
     }