diff --git a/ChangeLog b/ChangeLog
index 3449c18d6..560edfdb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-11-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/Contacts/SOGoContactLDAPFolder.m
+	([SOGoContactLDAPFolder -_qualifierForFilter:filter]): same as
+	below.
+
+	* SoObjects/Contacts/SOGoContactGCSFolder.m ([SOGoContactGCSFolder
+	-_qualifierForFilter:filter]): only search records which starts
+	with the specified pattern.
+
 2006-11-07  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/Mailer/SOGoDraftObject.m ([NSString
diff --git a/SoObjects/Contacts/SOGoContactGCSFolder.m b/SoObjects/Contacts/SOGoContactGCSFolder.m
index 9a5cd4abd..da9dbc237 100644
--- a/SoObjects/Contacts/SOGoContactGCSFolder.m
+++ b/SoObjects/Contacts/SOGoContactGCSFolder.m
@@ -128,9 +128,9 @@
   if (filter && [filter length] > 0)
     {
       qs = [NSString stringWithFormat:
-                       @"(sn isCaseInsensitiveLike: '%%%@%%') OR "
-                     @"(givenname isCaseInsensitiveLike: '%%%@%%') OR "
-                     @"(mail isCaseInsensitiveLike: '%%%@%%') OR "
+                       @"(sn isCaseInsensitiveLike: '%@%%') OR "
+                     @"(givenname isCaseInsensitiveLike: '%@%%') OR "
+                     @"(mail isCaseInsensitiveLike: '%@%%') OR "
                      @"(telephonenumber isCaseInsensitiveLike: '%%%@%%')",
                      filter, filter, filter, filter];
       qualifier = [EOQualifier qualifierWithQualifierFormat: qs];
diff --git a/SoObjects/Contacts/SOGoContactLDAPFolder.m b/SoObjects/Contacts/SOGoContactLDAPFolder.m
index a56bc2fcf..6ab54f5fe 100644
--- a/SoObjects/Contacts/SOGoContactLDAPFolder.m
+++ b/SoObjects/Contacts/SOGoContactLDAPFolder.m
@@ -335,7 +335,7 @@
                        @"(cn='%@*')"
                      @"OR (sn='%@*')"
                      @"OR (displayName='%@*')"
-                     @"OR (mail='*%@*')"
+                     @"OR (mail='%@*')"
                      @"OR (telephoneNumber='*%@*')",
                      filter, filter, filter, filter, filter];
       qualifier = [EOQualifier qualifierWithQualifierFormat: qs];