diff --git a/ChangeLog b/ChangeLog
index b10e79a12..bc3e1b992 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-08-15  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Mailer/SOGoMailBaseObject.m ([SOGoMailBaseObject
+	-isInDraftsFolder]): new method that detects if self is contained
+	by the drafts folder.
+
 	* SoObjects/Mailer/SOGoMailAccounts.m ([-fetchAllIdentities]):
 	removed method.
 	([-fetchIdentitiesWithEmitterPermissions]): removed method.
diff --git a/SoObjects/Mailer/SOGoMailBaseObject.h b/SoObjects/Mailer/SOGoMailBaseObject.h
index d22317868..ec2d8baaa 100644
--- a/SoObjects/Mailer/SOGoMailBaseObject.h
+++ b/SoObjects/Mailer/SOGoMailBaseObject.h
@@ -48,30 +48,32 @@
   NGImap4Connection *imap4;
 }
 
-- (id)initWithImap4URL:(NSURL *)_url inContainer:(id)_container;
+- (id) initWithImap4URL: (NSURL *) _url
+	    inContainer: (id) _container;
 
 /* hierarchy */
 
-- (SOGoMailAccount *)mailAccountFolder;
-- (SOGoMailAccounts *)mailAccountsFolder;
+- (SOGoMailAccount *) mailAccountFolder;
+- (SOGoMailAccounts *) mailAccountsFolder;
+- (BOOL) isInDraftsFolder;
 
 /* IMAP4 */
 
-- (NGImap4Connection *)imap4Connection;
-- (NGImap4ConnectionManager *)mailManager;
+- (NGImap4Connection *) imap4Connection;
+- (NGImap4ConnectionManager *) mailManager;
 
 - (NSString *) relativeImap4Name;
 - (NSMutableString *) imap4URLString;
 
-- (NSURL *)imap4URL;
-- (NSString *)imap4Login;
-- (NSString *)imap4Password;
+- (NSURL *) imap4URL;
+- (NSString *) imap4Login;
+- (NSString *) imap4Password;
 
-- (void)flushMailCaches;
+- (void) flushMailCaches;
 
 /* IMAP4 names */
 
-- (BOOL)isBodyPartKey:(NSString *)_key inContext:(id)_ctx;
+- (BOOL) isBodyPartKey: (NSString *) _key inContext: (id) _ctx;
 
 @end
 
diff --git a/SoObjects/Mailer/SOGoMailBaseObject.m b/SoObjects/Mailer/SOGoMailBaseObject.m
index 91d3c8d88..a317c44db 100644
--- a/SoObjects/Mailer/SOGoMailBaseObject.m
+++ b/SoObjects/Mailer/SOGoMailBaseObject.m
@@ -95,6 +95,11 @@ static BOOL debugOn = YES;
   return o;
 }
 
+- (BOOL) isInDraftsFolder
+{
+  return [container isInDraftsFolder];
+}
+
 /* IMAP4 */
 
 - (NGImap4ConnectionManager *) mailManager