diff --git a/main/css/base.css b/main/css/base.css
index 26b5019494..341e87d1c3 100644
--- a/main/css/base.css
+++ b/main/css/base.css
@@ -4783,3 +4783,31 @@ i.size-32.icon-new-work{
 #learning_path_left_zone .no-border {
     border: 0px;
 }
+
+.btn-invitations {
+    margin-left: 120px;
+}
+.btn-msg {
+  background: url("send_msg.png") no-repeat left center;
+  padding: 2px 6px;
+  padding-left: 18px;
+  font-size: 11px;
+  line-height: 14px;
+  background-color: #e6e6e6;
+}
+.btn-inv {
+  background: url("send_inv.png") no-repeat left center;
+  padding: 2px;
+  padding-left: 22px;
+  font-size: 11px;
+  line-height: 14px;
+  background-color: #e6e6e6;
+}
+.btn-inv-off {
+  background: url("send_inv_off.png") no-repeat left center;
+  padding: 2px;
+  padding-left: 22px;
+  font-size: 11px;
+  line-height: 14px;
+  background-color: #e6e6e6;
+}
\ No newline at end of file
diff --git a/main/css/send_inv.png b/main/css/send_inv.png
new file mode 100644
index 0000000000..8255f4ab5d
Binary files /dev/null and b/main/css/send_inv.png differ
diff --git a/main/css/send_inv_off.png b/main/css/send_inv_off.png
new file mode 100644
index 0000000000..4b88d3f8ea
Binary files /dev/null and b/main/css/send_inv_off.png differ
diff --git a/main/css/send_msg.png b/main/css/send_msg.png
new file mode 100644
index 0000000000..f779b4ab48
Binary files /dev/null and b/main/css/send_msg.png differ
diff --git a/main/social/search.php b/main/social/search.php
index d45a0e0431..5734d36279 100644
--- a/main/social/search.php
+++ b/main/social/search.php
@@ -12,9 +12,125 @@ $language_file = array('registration','admin','userInfo');
 $cidReset = true;
 require_once '../inc/global.inc.php';
 require_once api_get_path(LIBRARY_PATH).'group_portal_manager.lib.php';
-
+require_once api_get_path(LIBRARY_PATH).'magpierss/rss_fetch.inc';
+$ajax_url = api_get_path(WEB_AJAX_PATH).'message.ajax.php';
 api_block_anonymous_users();
 
+$htmlHeadXtra[] = '<script>
+
+function checkLength( o, n, min, max ) {
+    if ( o.val().length > max || o.val().length < min ) {
+        o.addClass( "ui-state-error" );
+        //updateTips( "Length of " + n + " must be between " + min + " and " + max + "." );
+        return false;
+    } else {
+        return true;
+    }
+}
+
+function send_message_to_user(user_id) {
+    var subject = $( "#subject_id" );
+    var content = $( "#content_id" );
+
+    $("#send_message_form").show();
+    $("#send_message_div").dialog({
+        modal:true,
+        height:350,
+        buttons: {
+            "'.  addslashes(get_lang('Sent')).'": function() {
+                var bValid = true;
+                bValid = bValid && checkLength( subject, "subject", 1, 255 );
+                bValid = bValid && checkLength( content, "content", 1, 255 );
+
+                if ( bValid ) {
+                    var url = "'.$ajax_url.'?a=send_message&user_id="+user_id;
+                    var params = $("#send_message_form").serialize();
+                    $.ajax({
+                        url: url+"&"+params,
+                        success:function(data) {
+                            $("#message_ajax_reponse").attr("class", "");
+                            $("#message_ajax_reponse").html(data);
+                            $("#message_ajax_reponse").show();
+                            $("#send_message_div").dialog({ buttons:{}});
+                            $("#send_message_form").hide();
+                            $("#send_message_div").dialog("close");
+
+                            $("#subject_id").val("");
+                            $("#content_id").val("");
+                        }
+                    });
+                }
+            },
+        },
+        close: function() {
+        }
+    });
+    $("#send_message_div").dialog("open");
+    //prevent the browser to follow the link
+}
+
+function send_invitation_to_user(user_id) {
+    var content = $( "#content_invitation_id" );
+    $("#send_invitation_form").show();
+    $("#send_invitation_div").dialog({
+        modal:true,
+        buttons: {
+            "'.  addslashes(get_lang('SendInvitation')).'": function() {
+                var bValid = true;
+                bValid = bValid && checkLength( content, "content", 1, 255 );
+                if (bValid) {
+                    var url = "'.$ajax_url.'?a=send_invitation&user_id="+user_id;
+                    var params = $("#send_invitation_form").serialize();
+                    $.ajax({
+                        url: url+"&"+params,
+                        success:function(data) {
+                            $("#message_ajax_reponse").attr("class", "");
+                            $("#message_ajax_reponse").html(data);
+                            $("#message_ajax_reponse").show();
+
+                            $("#send_invitation_div").dialog({ buttons:{}});
+
+                            $("#send_invitation_form").hide();
+                            $("#send_invitation_div").dialog("close");
+                            $("#content_invitation_id").val("");
+                        }
+                    });
+                }
+            },
+        },
+        close: function() {
+        }
+    });
+    $("#send_invitation_div").dialog("open");
+    //prevent the browser to follow the link
+}
+
+$(document).ready(function (){
+    $("input#id_btn_send_invitation").bind("click", function(){
+        if (confirm("'.get_lang('SendMessageInvitation', '').'")) {
+            $("#form_register_friend").submit();
+        }
+    });
+
+    $("#send_message_div").dialog({
+        autoOpen: false,
+        modal    : false,
+        width    : 550,
+        height    : 300
+       });
+
+    $("#send_invitation_div").dialog({
+        autoOpen: false,
+        modal    : false,
+        width    : 550,
+        height    : 300
+       });
+
+});
+
+
+</script>';
+
 if (api_get_setting('allow_social_tool') !='true') {
     api_not_allowed();
 }
@@ -41,19 +157,27 @@ if ($query !='') {
     }
 
     $results = '<div id="online_grid_container"><div class="span9">';
-
-    if (is_array($users) && count($users)> 0) {
+    //$list_friends = SocialManager::get_friends(api_get_user_id());
+    //$count = count($list_friends);
+    //$list_friends = $list_friends[0];
+     if (is_array($users) && count($users)> 0) {
         $results .=  Display::page_subheader(get_lang('Users'));
         $results .= '<ul class="thumbnails">';
         foreach($users as $user) {
+            $send_inv = '<button class="btn btn-mini btn-inv-off">'.get_lang('SendInvitation').'</button>';
+            $relation_type =  intval(SocialManager::get_relation_between_contacts(api_get_user_id(), $user['user_id'] ));
             $user_info = api_get_user_info($user['user_id'], true);
             $url = api_get_path(WEB_PATH).'main/social/profile.php?u='.$user['user_id'];
-
+            //Show send invitation icon if they are not friends yet
+            if ($relation_type != 3 && $relation_type != 4 && $user['user_id'] != api_get_user_id()) {
+                $send_inv = '<a href="javascript:void(0);" onclick="javascript:send_invitation_to_user(\''.$user['user_id'].'\');"/><button class="btn btn-mini btn-inv">'.get_lang('SendInvitation').'</button></a>';
+            }
+            $send_msg = '<a href="javascript:void(0);" onclick="javascript:send_message_to_user(\''.$user['user_id'].'\');"/><button class="btn btn-mini btn-msg">'.get_lang('SendMessage').'</button></a>';
             if (empty($user['picture_uri'])) {
-                $picture['file'] = api_get_path(WEB_CODE_PATH).'img/unknown_180_100.jpg';
+                $picture['file'] = api_get_path(WEB_CODE_PATH).'img/unknown.jpg';
                 $img = '<img src="'.$picture['file'].'">';
             } else {
-                $picture = UserManager::get_picture_user($user['user_id'], $user['picture_uri'], 80, USER_IMAGE_SIZE_ORIGINAL );
+                $picture = UserManager::get_picture_user($user['user_id'], $user['picture_uri'], 50, USER_IMAGE_SIZE_ORIGINAL );
                 $img = '<img src="'.$picture['file'].'">';
             }
             if ($user_info['user_is_online']) {
@@ -63,7 +187,8 @@ if ($query !='') {
             }
             $user['tag'] = isset($user['tag']) ? $user['tag'] : null;
             $user_info['complete_name'] = Display::url($status_icon.$user_info['complete_name'], $url).'<br />'.$user['tag'];
-            $results .= '<li class="span3"><div class="thumbnail">'.$img.'<div class="caption">'.$user_info['complete_name'].$user['tag'].'</div</div></li>';
+            $invitations = $user['tag'].$send_inv.$send_msg;
+            $results .= '<li class="span3 ">'.$user_info['complete_name'].'<div class="left">'.$img.'</div><div class="btn-invitations">'.$invitations.'</div></li>';
         }
         $results .='</ul></div></div>';
         $social_right_content .=  $results;
@@ -153,7 +278,8 @@ if ($query !='') {
     $visibility = array(true,true,true,true,true);
     $social_right_content .= Display::return_sortable_grid('mygroups', array(), $grid_groups, array('hide_navigation'=>true, 'per_page' => 5), $query_vars, false, $visibility);
 }
-
+$social_right_content .= MessageManager::generate_message_form('send_message');
+$social_right_content .= MessageManager::generate_invitation_form('send_invitation');
 
 $tpl = new Template($tool_name);
 $tpl->assign('social_left_content', $social_left_content);