diff --git a/ChangeLog b/ChangeLog
index c3113efab..04c2e8de8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-08-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Mailer/SOGoMailFolder.m ([SOGoMailBaseObject
+	-relativeImap4Name]): return nameInContainer stripped from its
+	first 6 characters since all folder names are prefixed with
+	"folder".
+
 	* SoObjects/Mailer/SOGoMailBaseObject.m ([SOGoMailBaseObject
 	-imap4URLString]): invoke -relativeImap4Name instead of
 	"nameInContainer" since the former will return the fixed IMAP4
diff --git a/SoObjects/Mailer/SOGoMailFolder.m b/SoObjects/Mailer/SOGoMailFolder.m
index 6b8ded478..5198482c7 100644
--- a/SoObjects/Mailer/SOGoMailFolder.m
+++ b/SoObjects/Mailer/SOGoMailFolder.m
@@ -102,7 +102,7 @@ static BOOL useAltNamespace = NO;
 
 - (NSString *) relativeImap4Name
 {
-  return nameInContainer;
+  return [nameInContainer substringFromIndex: 6];
 }
 
 /* listing the available folders */