diff --git a/ChangeLog b/ChangeLog
index 42d2499d0..bd5358d4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-06-21  Ludovic Marcotte  <lmarcotte@inverse.ca>
+
+	* Added the SOGoSearchMinimumWordLength domain
+	default which controls the minimal length required
+	before trigging server-side search operations for
+	attendee completion, contact searches, etc. The
+	default value is 2, which means search operations
+	are trigged once the 3rd character is typed.
+
 2012-06-20  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* SoObjects/Appointments/SOGoAppointmentObject.m
diff --git a/Documentation/SOGo Installation Guide.odt b/Documentation/SOGo Installation Guide.odt
index dd67e76e6..843a35b75 100644
Binary files a/Documentation/SOGo Installation Guide.odt and b/Documentation/SOGo Installation Guide.odt differ
diff --git a/SoObjects/SOGo/SOGoDefaults.plist b/SoObjects/SOGo/SOGoDefaults.plist
index c686a1665..127ddc2a8 100644
--- a/SoObjects/SOGo/SOGoDefaults.plist
+++ b/SoObjects/SOGo/SOGoDefaults.plist
@@ -70,4 +70,6 @@
 
     SOGoReminderEnabled = YES;
     SOGoRemindWithASound = YES;
+
+    SOGoSearchMinimumWordLength = 2;
 }
diff --git a/SoObjects/SOGo/SOGoDomainDefaults.h b/SoObjects/SOGo/SOGoDomainDefaults.h
index 2c0c86b94..fbed067ee 100644
--- a/SoObjects/SOGo/SOGoDomainDefaults.h
+++ b/SoObjects/SOGo/SOGoDomainDefaults.h
@@ -77,6 +77,8 @@
 
 - (BOOL) hideSystemEMail;
 
+- (int) searchMinimumWordLength;
+
 @end
 
 #endif /* SOGODOMAINDEFAULTS_H */
diff --git a/SoObjects/SOGo/SOGoDomainDefaults.m b/SoObjects/SOGo/SOGoDomainDefaults.m
index bb06640fe..6fe2abb7a 100644
--- a/SoObjects/SOGo/SOGoDomainDefaults.m
+++ b/SoObjects/SOGo/SOGoDomainDefaults.m
@@ -319,4 +319,9 @@
   return [self boolForKey: @"SOGoHideSystemEMail"];
 }
 
+- (int) searchMinimumWordLength
+{
+  return [self integerForKey: @"SOGoSearchMinimumWordLength"];
+}
+
 @end
diff --git a/UI/Common/UIxPageFrame.m b/UI/Common/UIxPageFrame.m
index ee990ad73..0b3282e47 100644
--- a/UI/Common/UIxPageFrame.m
+++ b/UI/Common/UIxPageFrame.m
@@ -1,15 +1,16 @@
 
 /*
   Copyright (C) 2004-2005 SKYRIX Software AG
+  Copyright (C) 2005-2012 Inverse inc.
 
-  This file is part of OpenGroupware.org.
+  This file is part of SOGo.
 
-  OGo is free software; you can redistribute it and/or modify it under
+  SOGo is free software; you can redistribute it and/or modify it under
   the terms of the GNU Lesser General Public License as published by the
   Free Software Foundation; either version 2, or (at your option) any
   later version.
 
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+  SOGo is distributed in the hope that it will be useful, but WITHOUT ANY
   WARRANTY; without even the implied warranty of MERCHANTABILITY or
   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
   License for more details.
@@ -590,4 +591,9 @@
 	   );
 }
 
+- (int) minimumSearchLength
+{
+  return [[[context activeUser] domainDefaults] searchMinimumWordLength];
+}
+
 @end /* UIxPageFrame */
diff --git a/UI/Contacts/UIxContactsFilterPanel.m b/UI/Contacts/UIxContactsFilterPanel.m
index 55fa93af5..a0f5721bb 100644
--- a/UI/Contacts/UIxContactsFilterPanel.m
+++ b/UI/Contacts/UIxContactsFilterPanel.m
@@ -1,14 +1,15 @@
 /*
  Copyright (C) 2000-2005 SKYRIX Software AG
+ Copyright (C) 2000-2012 Inverse inc.
  
- This file is part of OpenGroupware.org.
+ This file is part of SOGo.
  
- OGo is free software; you can redistribute it and/or modify it under
+ SOGo is free software; you can redistribute it and/or modify it under
  the terms of the GNU Lesser General Public License as published by the
  Free Software Foundation; either version 2, or (at your option) any
  later version.
  
- OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+ SOGo is distributed in the hope that it will be useful, but WITHOUT ANY
  WARRANTY; without even the implied warranty of MERCHANTABILITY or
  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
  License for more details.
diff --git a/UI/Contacts/UIxContactsUserFolders.m b/UI/Contacts/UIxContactsUserFolders.m
index 1ff941edf..ba4dad22f 100644
--- a/UI/Contacts/UIxContactsUserFolders.m
+++ b/UI/Contacts/UIxContactsUserFolders.m
@@ -1,6 +1,6 @@
 /* UIxContactsUserFolders.m - this file is part of SOGo
  *
- * Copyright (C) 2007-2010 Inverse inc.
+ * Copyright (C) 2007-2012 Inverse inc.
  *
  * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *
diff --git a/UI/Contacts/UIxListEditor.m b/UI/Contacts/UIxListEditor.m
index adb04de20..b13677e5f 100644
--- a/UI/Contacts/UIxListEditor.m
+++ b/UI/Contacts/UIxListEditor.m
@@ -1,6 +1,6 @@
 /* UIxListEditor.m - this file is part of SOGo
  *
- * Copyright (C) 2008-2011 Inverse inc.
+ * Copyright (C) 2008-2012 Inverse inc.
  *
  * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *         Francis Lachapelle <flachapelle@inverse.ca>
diff --git a/UI/Scheduler/UIxAttendeesEditor.h b/UI/Scheduler/UIxAttendeesEditor.h
index 7aa291a4e..530c33c51 100644
--- a/UI/Scheduler/UIxAttendeesEditor.h
+++ b/UI/Scheduler/UIxAttendeesEditor.h
@@ -1,6 +1,6 @@
 /* UIxAttendeesEditor.h - this file is part of SOGo
  *
- * Copyright (C) 2007 Inverse inc.
+ * Copyright (C) 2007-2012 Inverse inc.
  *
  * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *
@@ -28,7 +28,6 @@
 @interface UIxAttendeesEditor : UIxComponent
 {
   NSString *item;
-//   NSString *zoom;
 }
 
 - (void) setItem: (NSString *) newItem;
diff --git a/UI/Scheduler/UIxAttendeesEditor.m b/UI/Scheduler/UIxAttendeesEditor.m
index 51be1437e..40379d48e 100644
--- a/UI/Scheduler/UIxAttendeesEditor.m
+++ b/UI/Scheduler/UIxAttendeesEditor.m
@@ -1,6 +1,6 @@
 /* UIxAttendeesEditor.m - this file is part of SOGo
  *
- * Copyright (C) 2007 Inverse inc.
+ * Copyright (C) 2007-2012 Inverse inc.
  *
  * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *
diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index 6df36a98e..d81b37700 100644
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -130,6 +130,7 @@
 	  <script type="text/javascript">
 	    var ApplicationBaseURL = '<var:string value="modulePath"/>';
 	    var ResourcesURL = '<var:string value="applicationPath"/>.woa/WebServerResources';
+	    var minimumSearchLength = <var:string value="minimumSearchLength"/>;
 	    <var:if condition="isSuperUser"
 	      >var IsSuperUser = true;
 	    </var:if>
diff --git a/UI/WebServerResources/SOGoAutoCompletion.js b/UI/WebServerResources/SOGoAutoCompletion.js
index b7c137e05..290b371b5 100644
--- a/UI/WebServerResources/SOGoAutoCompletion.js
+++ b/UI/WebServerResources/SOGoAutoCompletion.js
@@ -125,7 +125,7 @@ var SOGoAutoCompletionInterface = {
             document.contactLookupAjaxRequest.aborted = true;
             document.contactLookupAjaxRequest.abort();
         }
-        if (input.value.trim().length > 2) {
+        if (input.value.trim().length > minimumSearchLength) {
             var urlstr = UserFolderURL + "Contacts/";
             if (input.addressBook)
                 urlstr += input.addressBook + "/contact";
diff --git a/UI/WebServerResources/UIxAttendeesEditor.js b/UI/WebServerResources/UIxAttendeesEditor.js
index b9c06cfc0..e0ce82be0 100644
--- a/UI/WebServerResources/UIxAttendeesEditor.js
+++ b/UI/WebServerResources/UIxAttendeesEditor.js
@@ -177,7 +177,7 @@ function onContactKeydown(event) {
 
 function performSearch(input) {
     // Perform address completion
-    if (!input.value.blank()) {
+    if (input.value.trim().length > minimumSearchLength) {
         var urlstr = (UserFolderURL
                       + "Contacts/allContactSearch?excludeGroups=1&search="
                       + encodeURIComponent(input.value));
diff --git a/UI/WebServerResources/UIxContactsUserFolders.js b/UI/WebServerResources/UIxContactsUserFolders.js
index 34df71132..06a4e99d2 100644
--- a/UI/WebServerResources/UIxContactsUserFolders.js
+++ b/UI/WebServerResources/UIxContactsUserFolders.js
@@ -1,8 +1,6 @@
 var d;
 
 function onSearchFormSubmit() {
-    startAnimation($("pageContent"), $("filterPanel"));
-
     var searchValue = $("searchValue");
     var encodedValue = encodeURI(searchValue.value);
 
@@ -16,8 +14,11 @@ function onSearchFormSubmit() {
             document.userFoldersRequest.aborted = true;
             document.userFoldersRequest.abort();
         }
-        document.userFoldersRequest
-            = triggerAjaxRequest(url, usersSearchCallback);
+	if (encodedValue.trim().length > minimumSearchLength) {
+	    startAnimation($("pageContent"), $("filterPanel"));
+            document.userFoldersRequest
+                = triggerAjaxRequest(url, usersSearchCallback);
+	}
     }
 
     return false;
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 6313c8924..4e8ccc642 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -1,7 +1,7 @@
 /* generic.js - this file is part of SOGo
 
    Copyright (C) 2005 SKYRIX Software AG
-   Copyright (C) 2006-2011 Inverse
+   Copyright (C) 2006-2012 Inverse
 
  SOGo is free software; you can redistribute it and/or modify it under
  the terms of the GNU Lesser General Public License as published by the
@@ -1143,7 +1143,7 @@ function onSearchFormSubmit(event) {
 
     if (searchValue.value != searchValue.ghostPhrase
         && (searchValue.value != searchValue.lastSearch
-            || searchValue.value.strip().length > 0)) {
+            && searchValue.value.strip().length > minimumSearchLength)) {
         search["criteria"] = searchCriteria.value;
         search["value"] = searchValue.value;
         searchValue.lastSearch = searchValue.value;