diff --git a/CHANGELOG b/CHANGELOG
index 40a538c76..63bf46cc1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,10 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
 
+2008/06/08 (alec)
+----------
+- Added option to disable autocompletion from selected LDAP address books (#1484922)
+
 2008/06/07 (thomasb)
 ----------
 - Cleaned up localization names. Now named with lang_COUNTRY according to ISO 639-1/3166-1
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index 8d71d8fcd..0be6d478d 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -271,6 +271,7 @@ $rcmail_config['address_book_type'] = 'sql';
  *  'sort'          => 'cn',    // The field to sort the listing by.
  *  'scope'         => 'sub',   // search mode: sub|base|list
  *  'filter'        => '',      // used for basic listing (if not empty) and will be &'d with search queries. example: status=act
+ *  'global_search' => true,    // perform a global search for address auto-completion on compose
  *  'fuzzy_search'  => true);   // server allows wildcard search
  */
 
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index c56bbd576..855066b0c 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -829,10 +829,11 @@ if (isset($CONFIG['ldap_public']))
   /* LDAP autocompletion */ 
   foreach ($CONFIG['ldap_public'] as $ldapserv_config) 
     { 
-    if ($ldapserv_config['fuzzy_search'] != 1) 
+    if ($ldapserv_config['fuzzy_search'] != 1 || 
+        $ldapserv_config['global_search'] != 1)
       { 
       continue; 
- 	  } 
+      }
 	 
     $LDAP = new rcube_ldap($ldapserv_config); 
     $LDAP->connect(); 
@@ -856,6 +857,8 @@ if (isset($CONFIG['ldap_public']))
 if ($a_contacts) 
   { 
  	$OUTPUT->set_env('contacts', $a_contacts); 
-  } 
+  }
+
 $OUTPUT->send('compose');
+
 ?>