diff --git a/ChangeLog b/ChangeLog
index 949376a99..c3113efab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-08-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Mailer/SOGoMailBaseObject.m ([SOGoMailBaseObject
+	-imap4URLString]): invoke -relativeImap4Name instead of
+	"nameInContainer" since the former will return the fixed IMAP4
+	foldername and the latter the SoObject name.
+
 	* SoObjects/Mailer/SOGoMailObject.m ([SOGoMailObject
 	+initialize]): we now fetch the "BODYSTRUCTURE" key instead of "BODY".
 
diff --git a/SoObjects/Mailer/SOGoMailBaseObject.m b/SoObjects/Mailer/SOGoMailBaseObject.m
index 4ba1c62ca..91d3c8d88 100644
--- a/SoObjects/Mailer/SOGoMailBaseObject.m
+++ b/SoObjects/Mailer/SOGoMailBaseObject.m
@@ -142,9 +142,11 @@ static BOOL debugOn = YES;
 - (NSMutableString *) imap4URLString
 {
   NSMutableString *urlString;
+  NSString *imap4Name;
 
   urlString = [container imap4URLString];
-  [urlString appendFormat: @"%@/", [nameInContainer stringByEscapingURL]];
+  imap4Name = [[self relativeImap4Name] stringByEscapingURL];
+  [urlString appendFormat: @"%@/", imap4Name];
 
   return urlString;
 }
@@ -154,9 +156,7 @@ static BOOL debugOn = YES;
   /* this could probably be handled better from NSURL but it's buggy in
      GNUstep */
   if (!imap4URL)
-    {
-      imap4URL = [[NSURL alloc] initWithString: [self imap4URLString]];
-    }
+    imap4URL = [[NSURL alloc] initWithString: [self imap4URLString]];
 
   return imap4URL;
 }