Index: imp/config/servers.php.dist
===================================================================
RCS file: /repository/imp/config/servers.php.dist,v
retrieving revision 1.50.2.23
diff -u -r1.50.2.23 servers.php.dist
--- imp/config/servers.php.dist	3 Jul 2008 13:06:15 -0000	1.50.2.23
+++ imp/config/servers.php.dist	14 Jul 2009 11:24:46 -0000
@@ -301,6 +301,9 @@
 );
 
 if ($GLOBALS['conf']['kolab']['enabled']) {
+    // When using Kolab, other mail servers are removed
+    $servers = Array();
+    
     require_once 'Horde/Kolab.php';
 
     if (!is_callable('Kolab', 'getServer')) {
Index: ingo/config/backends.php.dist
===================================================================
RCS file: /repository/ingo/config/backends.php.dist,v
retrieving revision 1.20.8.12
diff -u -r1.20.8.12 backends.php.dist
--- ingo/config/backends.php.dist	15 Dec 2008 02:33:07 -0000	1.20.8.12
+++ ingo/config/backends.php.dist	14 Jul 2009 11:24:48 -0000
@@ -300,6 +300,9 @@
 
 /* Kolab Example (using Sieve) */
 if ($GLOBALS['conf']['kolab']['enabled']) {
+    // When using Kolab, other backends are removed
+    $backends = Array();
+    
     require_once 'Horde/Kolab.php';
 
     if (!is_callable('Kolab', 'getServer')) {
Index: turba/config/sources.php.dist
===================================================================
RCS file: /repository/turba/config/sources.php.dist,v
retrieving revision 1.97.6.38
diff -u -r1.97.6.38 sources.php.dist
--- turba/config/sources.php.dist	12 Nov 2008 06:29:26 -0000	1.97.6.38
+++ turba/config/sources.php.dist	14 Jul 2009 11:24:48 -0000
@@ -772,6 +772,9 @@
 
 /* Begin Kolab sources. */
 if (!empty($GLOBALS['conf']['kolab']['enabled'])) {
+    // When using Kolab, other sources are removed
+    $cfgSources = Array();
+    
 
     /* Only use LDAP if we have that extension in PHP */
     if (function_exists('ldap_connect')) {
@@ -805,9 +808,11 @@
                 'version' => 3,
                 'bind_dn' => '',
                 'bind_password' => '',
+                'read_only' => true,
             ),
             'map' => array(
                 '__key'             => 'dn',
+                '__uid'             => 'dn',
                 'name'              => 'cn',
                 'firstname'         => 'givenName',
                 'lastname'          => 'sn',