diff --git a/ChangeLog b/ChangeLog
index d23d7bad3..748dfb9d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-10-23  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/Mailer/SOGoMailAccount.m ([SOGoMailAccount -inboxFolderInContext:_ctx])
+	([SOGoMailAccount -draftsFolderInContext:_ctx])
+	([SOGoMailAccount -sentFolderInContext:_ctx]): no longer make use
+	of the "SOGoSpecialFoldersInRoot" user defaults. The folders will
+	no always be specified from the root instead of sometimes from the
+	INBOX.
+
 2007-10-22  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/Common/UIxPageFrame.m ([UIxPageFrame -commonLocalizableStrings])
diff --git a/SoObjects/Mailer/SOGoMailAccount.m b/SoObjects/Mailer/SOGoMailAccount.m
index f39aa7f6b..aa2f1d05c 100644
--- a/SoObjects/Mailer/SOGoMailAccount.m
+++ b/SoObjects/Mailer/SOGoMailAccount.m
@@ -50,15 +50,12 @@ static NSString *sentFolderName = nil;
 static NSString *trashFolderName = nil;
 static NSString *sharedFolderName = @""; // TODO: add English default
 static NSString *otherUsersFolderName = @""; // TODO: add English default
-static BOOL useAltNamespace = NO;
 
 + (void) initialize
 {
   NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
   NSString *cfgDraftsFolderName;
 
-  useAltNamespace = [ud boolForKey:@"SOGoSpecialFoldersInRoot"];
-  
   sharedFolderName = [ud stringForKey:@"SOGoSharedFolderName"];
   otherUsersFolderName = [ud stringForKey:@"SOGoOtherUsersFolderName"];
   cfgDraftsFolderName = [ud stringForKey:@"SOGoDraftsFolderName"];
@@ -406,21 +403,16 @@ static BOOL useAltNamespace = NO;
 
 - (SOGoDraftsFolder *) draftsFolderInContext: (id) _ctx
 {
-  SOGoMailFolder *lookupFolder;
   // TODO: use some profile to determine real location, use a -traverse lookup
 
   if (!draftsFolder)
     {
-      lookupFolder = (useAltNamespace
-		      ? (id) self
-		      : [self inboxFolderInContext:_ctx]);
-      if (![lookupFolder isKindOfClass: [NSException class]])
-	draftsFolder
-	  = [lookupFolder lookupName: [self draftsFolderNameInContext:_ctx]
-			  inContext: _ctx acquire: NO];
-      if (![draftsFolder isNotNull])
-	draftsFolder = [NSException exceptionWithHTTPStatus: 404 /* not found */
-				    reason: @"did not find Drafts folder!"];
+      draftsFolder
+	= [self lookupName: [self draftsFolderNameInContext:_ctx]
+		inContext: _ctx acquire: NO];
+//       if (![draftsFolder isNotNull])
+// 	draftsFolder = [NSException exceptionWithHTTPStatus: 404 /* not found */
+// 				    reason: @"did not find Drafts folder!"];
       [draftsFolder retain];
     }
 
@@ -429,20 +421,15 @@ static BOOL useAltNamespace = NO;
 
 - (SOGoMailFolder *) sentFolderInContext: (id) _ctx
 {
-  SOGoMailFolder *lookupFolder;
   // TODO: use some profile to determine real location, use a -traverse lookup
 
   if (!sentFolder)
     {
-      lookupFolder = (useAltNamespace
-		      ? (id) self
-		      : [self inboxFolderInContext:_ctx]);
-      if (![lookupFolder isKindOfClass: [NSException class]])
-	sentFolder = [lookupFolder lookupName: [self sentFolderNameInContext:_ctx]
-				   inContext: _ctx acquire: NO];
-      if (![sentFolder isNotNull])
-	sentFolder = [NSException exceptionWithHTTPStatus: 404 /* not found */
-				  reason: @"did not find Sent folder!"];
+      sentFolder = [self lookupName: [self sentFolderNameInContext:_ctx]
+			 inContext: _ctx acquire: NO];
+//       if (![sentFolder isNotNull])
+// 	sentFolder = [NSException exceptionWithHTTPStatus: 404 /* not found */
+// 				  reason: @"did not find Sent folder!"];
       [sentFolder retain];
     }
 
@@ -451,20 +438,13 @@ static BOOL useAltNamespace = NO;
 
 - (SOGoMailFolder *) trashFolderInContext: (id) _ctx
 {
-  SOGoMailFolder *lookupFolder;
-  // TODO: use some profile to determine real location, use a -traverse lookup
-
   if (!trashFolder)
     {
-      lookupFolder = (useAltNamespace
-		      ? (id) self
-		      : [self inboxFolderInContext:_ctx]);
-      if (![lookupFolder isKindOfClass: [NSException class]])
-	trashFolder = [lookupFolder lookupName: [self trashFolderNameInContext: _ctx]
- 				    inContext: _ctx acquire: NO];
-      if (![trashFolder isNotNull])
-	trashFolder = [NSException exceptionWithHTTPStatus: 404 /* not found */
-				  reason: @"did not find Trash folder!"];
+      trashFolder = [self lookupName: [self trashFolderNameInContext: _ctx]
+			  inContext: _ctx acquire: NO];
+//       if (![trashFolder isNotNull])
+// 	trashFolder = [NSException exceptionWithHTTPStatus: 404 /* not found */
+// 				  reason: @"did not find Trash folder!"];
       [trashFolder retain];
     }
 
diff --git a/SoObjects/Mailer/SOGoMailFolder.m b/SoObjects/Mailer/SOGoMailFolder.m
index bf277fbbc..50f2484b0 100644
--- a/SoObjects/Mailer/SOGoMailFolder.m
+++ b/SoObjects/Mailer/SOGoMailFolder.m
@@ -43,15 +43,6 @@ static NSString *defaultUserID =  @"anyone";
 
 @implementation SOGoMailFolder
 
-static BOOL useAltNamespace = NO;
-
-+ (void) initialize
-{
-  NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-
-  useAltNamespace = [ud boolForKey:@"SOGoSpecialFoldersInRoot"];
-}
-
 - (void) _adjustOwner
 {
   SOGoMailAccount *mailAccount;