diff --git a/ChangeLog b/ChangeLog
index 5673f01e6..4559f8e52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-12  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/Contacts/UIxContactEditor.m ([UIxContactEditor
+	-addressBooksList]): LDAP-based addressbooks must not be
+	editable, even for super users.
+
 2009-06-11  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/SOGo/SOGoUserFolder.m (-davUserQuery:): do not return
diff --git a/Documentation/SOGo Installation Guide.odt b/Documentation/SOGo Installation Guide.odt
index aad1a20e8..719e51a49 100644
Binary files a/Documentation/SOGo Installation Guide.odt and b/Documentation/SOGo Installation Guide.odt differ
diff --git a/SoObjects/SOGo/SOGoGroup.m b/SoObjects/SOGo/SOGoGroup.m
index 983076a00..158a1cd7e 100644
--- a/SoObjects/SOGo/SOGoGroup.m
+++ b/SoObjects/SOGo/SOGoGroup.m
@@ -138,7 +138,7 @@
       
       // We check to see if it's a group
       classes = [[entry attributeWithName: @"objectClass"] allStringValues];
-      NSLog(@"classes = %@", classes);
+      NSLog(@"classes for %@ = %@", theValue, classes);
 
       // Found a group, let's return it.
       if ([classes containsObject: @"group"] ||
diff --git a/UI/Contacts/UIxContactEditor.m b/UI/Contacts/UIxContactEditor.m
index e03b307d1..5e6f5fb23 100644
--- a/UI/Contacts/UIxContactEditor.m
+++ b/UI/Contacts/UIxContactEditor.m
@@ -186,9 +186,10 @@
   while (currentFolder)
     {
       if ([currentFolder isEqual: folder] ||
-	  ![sm validatePermission: SoPerm_AddDocumentsImagesAndFiles
-	       onObject: currentFolder
-	       inContext: context])
+	  ([currentFolder isKindOfClass: [SOGoContactGCSFolder class]] &&
+	   ![sm validatePermission: SoPerm_AddDocumentsImagesAndFiles
+			  onObject: currentFolder
+			 inContext: context]))
 	[addressBooksList addObject: currentFolder];
       currentFolder = [folders nextObject];
     }