diff --git a/ChangeLog b/ChangeLog
index c26c05cdc..b2ba962a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-10-23  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Contacts/SOGoContactSourceFolder.m
+	(-initWithName:andDisplayName:inContainer:): use the source name
+	when the displayname is nil.
+
 	* SoObjects/SOGo/SOGoUserManager.m (_registerSource:): added
 	sanity checks and warnings to the user.
 
diff --git a/SoObjects/Contacts/SOGoContactSourceFolder.m b/SoObjects/Contacts/SOGoContactSourceFolder.m
index 472ffa03d..83fa114e2 100644
--- a/SoObjects/Contacts/SOGoContactSourceFolder.m
+++ b/SoObjects/Contacts/SOGoContactSourceFolder.m
@@ -124,6 +124,8 @@
   if ((self = [self initWithName: newName
 		    inContainer: newContainer]))
     {
+      if (![newDisplayName length])
+        newDisplayName = newName;
       ASSIGN (displayName, newDisplayName);
     }