diff --git a/main/inc/ajax/message.ajax.php b/main/inc/ajax/message.ajax.php
index a2292891fb..3704717901 100755
--- a/main/inc/ajax/message.ajax.php
+++ b/main/inc/ajax/message.ajax.php
@@ -9,7 +9,7 @@ $action = $_GET['a'];
 switch ($action) {
 	case 'find_users':
 
-		if (api_is_anonymous()){
+		if (api_is_anonymous()) {
 			echo '';
 			break;
 		}
@@ -23,18 +23,18 @@ switch ($action) {
 		$user_id = api_get_user_id();
 		$is_western_name_order = api_is_western_name_order();
 
-		if (api_get_setting('allow_social_tool')=='true' && api_get_setting('allow_message_tool')=='true') {
+		if (api_get_setting('allow_social_tool')=='true' && api_get_setting('allow_message_tool') == 'true') {
 			//all users            
-			if (api_get_setting('allow_send_message_to_all_platform_users') == 'true' || api_is_platform_admin() ) {        
+			if (api_get_setting('allow_send_message_to_all_platform_users') == 'true' || api_is_platform_admin() ) {     
 				$sql = 'SELECT DISTINCT u.user_id as id, '.($is_western_name_order ? 'concat(u.firstname," ",u.lastname," ","( ",u.email," )")' : 'concat(u.lastname," ",u.firstname," ","( ",u.email," )")').' as name
 				FROM '.$tbl_user.' u
-		 		WHERE u.status <> 6  AND u.user_id <>'.(int)$user_id.' AND '.($is_western_name_order ? 'concat(u.firstname, " ", u.lastname)' : 'concat(u.lastname, " ", u.firstname)').' like CONCAT("%","'.$search.'","%") LIMIT 15';
+		 		WHERE u.status <> 6  AND u.user_id <>'.$user_id.' AND '.($is_western_name_order ? 'concat(u.firstname, " ", u.lastname)' : 'concat(u.lastname, " ", u.firstname)').' LIKE CONCAT("%","'.$search.'","%") ';
 			} else {
 				require_once api_get_path(LIBRARY_PATH).'social.lib.php'; 
 				//only my contacts
 				$sql = 'SELECT DISTINCT u.user_id as id, '.($is_western_name_order ? 'concat(u.firstname," ",u.lastname," ","( ",u.email," )")' : 'concat(u.lastname," ",u.firstname," ","( ",u.email," )")').' as name
 				FROM '.$tbl_my_user_friend.' uf INNER JOIN '.$tbl_my_user.' AS u  ON uf.friend_user_id = u.user_id ' .
-		 		'WHERE u.status <> 6 AND relation_type NOT IN('.USER_RELATION_TYPE_DELETED.', '.USER_RELATION_TYPE_RRHH.') AND uf.user_id = '.$user_id.' AND friend_user_id<>'.$user_id.' AND '.($is_western_name_order ? 'concat(u.firstname, " ", u.lastname)' : 'concat(u.lastname, " ", u.firstname)').' like CONCAT("%","'.$search.'","%") ';
+		 		'WHERE u.status <> 6 AND relation_type NOT IN('.USER_RELATION_TYPE_DELETED.', '.USER_RELATION_TYPE_RRHH.') AND uf.user_id = '.$user_id.' AND friend_user_id<>'.$user_id.' AND '.($is_western_name_order ? 'concat(u.firstname, " ", u.lastname)' : 'concat(u.lastname, " ", u.firstname)').' LIKE CONCAT("%","'.$search.'","%") ';
 			}
 		} elseif (api_get_setting('allow_social_tool')=='false' && api_get_setting('allow_message_tool')=='true') {
 			
@@ -42,12 +42,13 @@ switch ($action) {
 
 			$sql='SELECT DISTINCT u.user_id as id, '.($is_western_name_order ? 'concat(u.firstname," ",u.lastname," ","( ",u.email," )")' : 'concat(u.lastname," ",u.firstname," ","( ",u.email," )")').' as name
 			 FROM '.$tbl_my_user.' u INNER JOIN '.$track_online_table.' t ON u.user_id=t.login_user_id
-			 WHERE DATE_ADD(login_date,INTERVAL "'.$valid.'" MINUTE) >= "'.$current_date.'" AND '.($is_western_name_order ? 'concat(u.firstname, " ", u.lastname)' : 'concat(u.lastname, " ", u.firstname)').' like CONCAT("%","'.$search.'","%") ';
-		}
+			 WHERE DATE_ADD(login_date,INTERVAL "'.$valid.'" MINUTE) >= "'.$current_date.'" AND '.($is_western_name_order ? 'concat(u.firstname, " ", u.lastname)' : 'concat(u.lastname, " ", u.firstname)').' LIKE CONCAT("%","'.$search.'","%") ';
+		}		
+		$sql .=' LIMIT 20';
 		$result=Database::query($sql);
 
-		if (Database::num_rows($result)>0) {
-				while ($row = Database::fetch_array($result,'ASSOC')) {
+		if (Database::num_rows($result) > 0) {
+            while ($row = Database::fetch_array($result,'ASSOC')) {
 				$return[] = array('caption'=>$row['name'], 'value'=>$row['id']);
 			}
 		}
diff --git a/main/messages/new_message.php b/main/messages/new_message.php
index 1f6510c0ec..d958875526 100755
--- a/main/messages/new_message.php
+++ b/main/messages/new_message.php
@@ -48,20 +48,19 @@ $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/tag
 $htmlHeadXtra[] = '<link  href="'.api_get_path(WEB_LIBRARY_PATH).'javascript/tag/style.css" rel="stylesheet" type="text/css" />';
 
 $htmlHeadXtra[] = '<script type="text/javascript">
-$(document).ready(function (){
-
-      		$("#users").fcbkcomplete({
-	            json_url: "'.api_get_path(WEB_AJAX_PATH).'message.ajax.php?a=find_users",
-	            cache: false,
-	            filter_case: true,
-	            filter_hide: true,
-	            complete_text:"'.get_lang('StartToType').'",
-				firstselected: true,
-	            //onremove: "testme",
-				//onselect: "testme",
-	            filter_selected: true,
-	            newel: true
-          	});
+$(document).ready(function () {
+    $("#users").fcbkcomplete({
+        json_url: "'.api_get_path(WEB_AJAX_PATH).'message.ajax.php?a=find_users",
+        cache: false,
+        filter_case: false,
+        filter_hide: true,
+        complete_text:"'.get_lang('StartToType').'",
+    	firstselected: true,
+        //onremove: "testme",
+    	//onselect: "testme",
+        filter_selected: true,
+        newel: true
+    });
 });
 
 var counter_image = 1;