diff --git a/ChangeLog b/ChangeLog
index a7cbace9c..67c4fad5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-02-02  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Mailer/SOGoMailBodyPart.m (-imap4URL): we assign our
+	"imap4URL" ivar so that it can be access directly in order
+	methods.
+
 	* Tests/Integration/test-davacl.py
 	(DAVCalendarAclTest._testEventDAVAcl): test
 	current-user-privilege-set on tasks too.
diff --git a/SoObjects/Mailer/SOGoMailBodyPart.m b/SoObjects/Mailer/SOGoMailBodyPart.m
index b0c06e7e7..cf58c1023 100644
--- a/SoObjects/Mailer/SOGoMailBodyPart.m
+++ b/SoObjects/Mailer/SOGoMailBodyPart.m
@@ -138,7 +138,13 @@ static BOOL debugOn = NO;
 - (NSURL *) imap4URL
 {
   /* reuse URL of message */
-  return [[self mailObject] imap4URL];
+  if (!imap4URL)
+    {
+      imap4URL = [[self mailObject] imap4URL];
+      [imap4URL retain];
+    }
+
+  return imap4URL;
 }
 
 /* part info */