diff --git a/main/inc/lib/message.lib.php b/main/inc/lib/message.lib.php
index 3ad6597829..ff7f3a918d 100755
--- a/main/inc/lib/message.lib.php
+++ b/main/inc/lib/message.lib.php
@@ -1398,8 +1398,7 @@ class MessageManager
         $form = new FormValidator('send_invitation', null, 'post', null, array('id' => $id.'_form', 'class' => 'form-vertical'));
         //$form->addElement('text', 'subject', get_lang('Subject'), array('id' => 'subject_id'));
         $form->addElement('textarea', 'content', get_lang('AddPersonalMessage'), array('id' => 'content_invitation_id', 'rows' => '5', 'class' => 'span5'));
-        $div = Display::div($form->return_form(), array('id' => $id.'_div', 'style' => 'display:none'));
-        return $div;
+        return $form->return_form();
     }
 
     //@todo this functions should be in the message class
diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php
index 5c25483e3f..2d358129fe 100755
--- a/main/inc/lib/social.lib.php
+++ b/main/inc/lib/social.lib.php
@@ -771,7 +771,7 @@ class SocialManager extends UserManager
                 $html .= '<li><a href="'.api_get_path(WEB_CODE_PATH).'social/invitations.php">'.Display::return_icon('invitation.png', get_lang('YouAlreadySentAnInvitation')).'&nbsp;&nbsp;'.get_lang('YouAlreadySentAnInvitation').'</a></li>';
             } else {
                 if (!$show_full_profile) {
-                    $html .= '<li><a  href="javascript:void(0);" onclick="javascript:send_invitation_to_user(\''.$user_id.'\');" title="'.get_lang('SendInvitation').'">'.Display :: return_icon('invitation.png', get_lang('SocialInvitationToFriends')).'&nbsp;'.get_lang('SendInvitation').'</a></li>';
+                    $html .= '<li><a class="btn-to-send-invitation" href="#" data-send-to="' . $user_id . '" title="'.get_lang('SendInvitation').'">'.Display :: return_icon('invitation.png', get_lang('SocialInvitationToFriends')).'&nbsp;'.get_lang('SendInvitation').'</a></li>';
                 }
             }
 
diff --git a/main/social/profile.php b/main/social/profile.php
index 501de23021..b2f74b6ecf 100755
--- a/main/social/profile.php
+++ b/main/social/profile.php
@@ -144,42 +144,6 @@ function checkLength( o, n, min, max ) {
     }
 }
 
-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
-}
-
 function toogle_course (element_html, course_code){
     elem_id=$(element_html).attr("id");
     id_elem=elem_id.split("_");
@@ -838,7 +802,6 @@ if ($show_full_profile) {
     }
 }
 
-$social_right_content .= MessageManager::generate_invitation_form('send_invitation');
 
 
 $tpl = new Template(get_lang('Social'));
@@ -857,6 +820,7 @@ $tpl->assign('socialAutoExtendLink', $socialAutoExtendLink);
 
 $formModalTpl =  new Template();
 $formModalTpl->assign('messageForm', MessageManager::generate_message_form('send_message'));
+$formModalTpl->assign('invitationForm', MessageManager::generate_invitation_form('send_invitation'));
 $formModals = $formModalTpl->fetch('default/social/form_modals.tpl');
 
 $tpl->assign('formModals', $formModals);
diff --git a/main/template/default/social/form_modals.tpl b/main/template/default/social/form_modals.tpl
index f5644caf43..ab5eaba31d 100644
--- a/main/template/default/social/form_modals.tpl
+++ b/main/template/default/social/form_modals.tpl
@@ -18,9 +18,30 @@
     </div>
 </div>
 
+<div class="modal fade" id="send-invitation-modal" tabindex="-1" role="dialog" aria-labelledby="send-invitation-modal-title" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'Close' | get_lang }}">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+                <h4 class="modal-title" id="send-invitation-modal-title">{{ 'SendInvitation' | get_lang }}</h4>
+            </div>
+            <div class="modal-body">
+                <div id="send-invitation-alert"></div>
+                {{ invitationForm }}
+            </div>
+            <div class="modal-footer">
+                <button type="button" id="btn-send-invitation" class="btn btn-primary">{{ 'Send' | get_lang }}</button>
+            </div>
+        </div>
+    </div>
+</div>
+
 <script>
     $(document).on('ready', function() {
-        var $sendMessageModal = $('#send-message-modal');
+        var $sendMessageModal = $('#send-message-modal'),
+            $sendInvitationModal = $('#send-invitation-modal');
 
         var sendToUser = 0;
 
@@ -43,6 +64,31 @@
 
                 $frmSendMessage[0].reset();
             });
+
+            sendToUser = 0;
+        });
+
+        $('.btn-to-send-invitation').on('click', function(e) {
+            e.preventDefault();
+
+            sendToUser = $(this).data('send-to');
+
+            $sendInvitationModal.modal('show');
+        });
+
+        $('#btn-send-invitation').on('click', function(e) {
+            e.preventDefault();
+
+            var $frmSendInvitation = $sendInvitationModal.find('.modal-body form'),
+                url = '{{ _p.web_ajax }}message.ajax.php?a=send_invitation&user_id=' + sendToUser;
+
+            $.get(url, $frmSendInvitation.serialize(), function(response) {
+                $('#send-invitation-alert').html(response);
+
+                $frmSendInvitation[0].reset();
+            });
+
+            sendToUser = 0;
         });
     });
 </script>