diff --git a/ChangeLog b/ChangeLog
index 7669b9008..0dec38540 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-09  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/Appointments/SOGoFreeBusyObject.m
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];
     }