diff --git a/ChangeLog b/ChangeLog
index bf2e797b7..1c00eab4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-05-02  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoUserFolder.m ([SOGoUserFolder
+	-davDisplayName]): new overriden method to provide a display name
+	to the users principal.
+
 	* SoObjects/SOGo/SOGoPermissions.[hm]: removed the "Save Acls"
 	permission since its purposes matches SOPE's "Change Permissions".
 
diff --git a/SoObjects/SOGo/SOGoUserFolder.m b/SoObjects/SOGo/SOGoUserFolder.m
index a7e6ba514..0bc23b532 100644
--- a/SoObjects/SOGo/SOGoUserFolder.m
+++ b/SoObjects/SOGo/SOGoUserFolder.m
@@ -556,106 +556,15 @@
   return cos;
 }
 
+- (NSString *) davDisplayName
+{
+  return [[LDAPUserManager sharedUserManager]
+	   getCNForUID: nameInContainer];
+}
+
 - (BOOL) davIsCollection
 {
   return YES;
 }
 
-// /* CalDAV support */
-// - (NSArray *) davCalendarHomeSet
-// {
-//   /*
-//     <C:calendar-home-set xmlns:D="DAV:"
-//         xmlns:C="urn:ietf:params:xml:ns:caldav">
-//       <D:href>http://cal.example.com/home/bernard/calendars/</D:href>
-//     </C:calendar-home-set>
-
-//     Note: this is the *container* for calendar collections, not the
-//           collections itself. So for use its the home folder, the
-// 	  public folder and the groups folder.
-//   */
-//   NSArray *tag;
-//   SOGoAppointmentFolders *parent;
-
-//   parent = [self privateCalendars: @"Calendar" inContext: context];
-//   tag = [NSArray arrayWithObjects: @"href", @"DAV:", @"D",
-//                  [parent davURL], nil];
-
-//   return [NSArray arrayWithObject: tag];
-// }
-
-// - (NSArray *) davCalendarUserAddressSet
-// {
-//   NSArray *tag, *allEmails;
-//   NSMutableArray *addresses;
-//   NSEnumerator *emails;
-//   NSString *currentEmail;
-
-//   addresses = [NSMutableArray array];
-
-//   allEmails = [[context activeUser] allEmails];
-//   emails = [allEmails objectEnumerator];
-//   while ((currentEmail = [emails nextObject]))
-//     {
-//       tag = [NSArray arrayWithObjects: @"href", @"DAV:", @"D",
-// 		     [NSString stringWithFormat: @"MAILTO:%@", currentEmail],
-// 		     nil];
-//       [addresses addObject: tag];
-//     }
-
-//   return addresses;
-// }
-
-// - (NSArray *) davCalendarScheduleInboxURL
-// {
-//   NSArray *tag;
-//   SOGoAppointmentFolders *parent;
-
-//   parent = [self privateCalendars: @"Calendar" inContext: context];
-//   tag = [NSArray arrayWithObjects: @"href", @"DAV:", @"D",
-//                  [NSString stringWithFormat: @"%@personal/", [parent davURL]],
-// 		 nil];
-
-//   return [NSArray arrayWithObject: tag];
-// }
-
-// - (NSString *) davCalendarScheduleOutboxURL
-// {
-//   NSArray *tag;
-//   SOGoAppointmentFolders *parent;
-
-//   parent = [self privateCalendars: @"Calendar" inContext: context];
-//   tag = [NSArray arrayWithObjects: @"href", @"DAV:", @"D",
-//                  [NSString stringWithFormat: @"%@personal/", [parent davURL]],
-// 		 nil];
-
-//   return [NSArray arrayWithObject: tag];
-// }
-
-// - (NSString *) davDropboxHomeURL
-// {
-//   NSArray *tag;
-//   SOGoAppointmentFolders *parent;
-
-//   parent = [self privateCalendars: @"Calendar" inContext: context];
-//   tag = [NSArray arrayWithObjects: @"href", @"DAV:", @"D",
-//                  [NSString stringWithFormat: @"%@personal/", [parent davURL]],
-// 		 nil];
-
-//   return [NSArray arrayWithObject: tag];
-// }
-
-// - (NSString *) davNotificationsURL
-// {
-//   NSArray *tag;
-//   SOGoAppointmentFolders *parent;
-
-//   parent = [self privateCalendars: @"Calendar" inContext: context];
-//   tag = [NSArray arrayWithObjects: @"href", @"DAV:", @"D",
-//                  [NSString stringWithFormat: @"%@personal/", [parent davURL]],
-// 		 nil];
-
-//   return [NSArray arrayWithObject: tag];
-// }
-
 @end /* SOGoUserFolder */