diff --git a/ChangeLog b/ChangeLog
index 3a739a47d..8d4c82079 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
         * Reverted previous patch and provided the correct
 	fix in SOGoMailFolder: -postData:flags:
 	* Fixed the compilation of unit tests for NGCards.
+	* SoObjects/Mailer/SOGoMailFolder.m: Added -displayName
+	which returns -nameInContainer to avoid crashes when
+	sending ACL changes notifications for email folders.
 
 2009-04-09  Francis Lachapelle  <flachapelle@inverse.ca>
 
diff --git a/SoObjects/Mailer/SOGoMailFolder.m b/SoObjects/Mailer/SOGoMailFolder.m
index 5b5d6f37d..4f0a19a5b 100644
--- a/SoObjects/Mailer/SOGoMailFolder.m
+++ b/SoObjects/Mailer/SOGoMailFolder.m
@@ -1097,6 +1097,11 @@ static NSString *spoolFolder = nil;
   return ([fm createDirectoriesAtPath: [self userSpoolFolderPath] attributes:nil]);
 }
 
+- (NSString *) displayName
+{
+  return [self nameInContainer];
+}
+
 @end /* SOGoMailFolder */
 
 @implementation SOGoSpecialMailFolder