diff --git a/assets/js/app.js b/assets/js/app.js
index 6c3074286d..57fc30b364 100644
--- a/assets/js/app.js
+++ b/assets/js/app.js
@@ -11,10 +11,10 @@ var legacyIndex = Routing.generate('legacy_index');
 var mainUrl = Routing.generate('web.main');
 var webAjax = Routing.generate('web.ajax');
 
-console.log(homePublicUrl);
+/*console.log(homePublicUrl);
 console.log(legacyIndex);
 console.log(mainUrl);
-console.log(webAjax);
+console.log(webAjax);*/
 
 var ajax_url = webAjax + 'chat.ajax.php';
 var online_button = '<img src="' + homePublicUrl + 'img/statusonline.png">';
diff --git a/main/inc/lib/message.lib.php b/main/inc/lib/message.lib.php
index 956ca31f21..c30abc5084 100755
--- a/main/inc/lib/message.lib.php
+++ b/main/inc/lib/message.lib.php
@@ -1213,8 +1213,8 @@ class MessageManager
                     user_sender_id
                 FROM $table
                 WHERE
-                    user_sender_id = ".api_get_user_id()." AND
-                    msg_status = ".MESSAGE_STATUS_OUTBOX."
+                    user_sender_id = " . api_get_user_id() . " AND
+                    msg_status = " . MESSAGE_STATUS_OUTBOX . "
                     $keywordCondition
                 ORDER BY col$column $direction
                 LIMIT $from, $number_of_items";
@@ -1229,7 +1229,7 @@ class MessageManager
             $senderId = $row['user_sender_id'];
 
             if ($request === true) {
-                $message[0] = '<input type="checkbox" value='.$messageId.' name="out[]">';
+                $message[0] = '<input type="checkbox" value=' . $messageId . ' name="out[]">';
             } else {
                 $message[0] = $messageId;
             }
@@ -1238,30 +1238,33 @@ class MessageManager
             $title = Security::remove_XSS($title);
             $userInfo = api_get_user_info($senderId);
             if ($request === true) {
-                $message[1] = '<a onclick="show_sent_message('.$messageId.')" href="javascript:void(0)">'.$userInfo['complete_name_with_username'].'</a>';
-                $message[2] = '<a onclick="show_sent_message('.$messageId.')" href="javascript:void(0)">'.str_replace(
+                $message[1] = '<a onclick="show_sent_message(' . $messageId . ')" href="javascript:void(0)">' . $userInfo['complete_name_with_username'] . '</a>';
+                $message[2] = '<a onclick="show_sent_message(' . $messageId . ')" href="javascript:void(0)">' . str_replace(
                         "\\",
                         "",
                         $title
-                    ).'</a>';
+                    ) . '</a>';
                 //date stays the same
                 $message[3] = api_convert_and_format_date($sendDate, DATE_TIME_FORMAT_LONG);
-                $message[4] = '&nbsp;&nbsp;<a title="'.addslashes(
+                $message[4] = '<a class="btn btn-outline-secondary btn-sm" title="' . addslashes(
                         get_lang('DeleteMessage')
-                    ).'" onclick="delete_one_message_outbox('.$messageId.')" href="javascript:void(0)"  >'.
-                    Display::returnFontAwesomeIcon('trash', 2).'</a>';
+                    ) . '" onclick="delete_one_message_outbox(' . $messageId . ')" href="javascript:void(0)"  >' .
+                    Display::returnFontAwesomeIcon('trash', 2) . '</a>';
             } else {
-                $message[1] = '<a '.$class.' onclick="show_sent_message('.$messageId.')" href="../messages/view_message.php?id_send='.$messageId.'">'.$title.'</a><br />'.$userInfo['complete_name_with_username'];
-                $message[2] = api_convert_and_format_date($sendDate, DATE_TIME_FORMAT_LONG);
-                $message[3] = '<a title="'.addslashes(
+                $message[1] = '<img class="rounded-circle mr-2" src="'.$userInfo['avatar_small'].'"/>';
+                $message[1].= $userInfo['complete_name_with_username'];
+                $message[2] = '<a ' . $class . ' onclick="show_sent_message(' . $messageId . ')" href="../messages/view_message.php?id_send=' . $messageId . '">' . $title . '</a>';
+                $message[3] = api_convert_and_format_date($sendDate, DATE_TIME_FORMAT_LONG);
+                $message[4] = '<a class="btn btn-outline-secondary btn-sm" title="' . addslashes(
                         get_lang('DeleteMessage')
-                    ).'" href="outbox.php?action=deleteone&id='.$messageId.'"  onclick="javascript:if(!confirm('."'".addslashes(
+                    ) . '" href="outbox.php?action=deleteone&id=' . $messageId . '"  onclick="javascript:if(!confirm(' . "'" . addslashes(
                         api_htmlentities(get_lang('ConfirmDeleteMessage'))
-                    )."'".')) return false;" >'.
-                    Display::returnFontAwesomeIcon('trash', 2).'</a>';
+                    ) . "'" . ')) return false;" >' .
+                    Display::returnFontAwesomeIcon('trash', 'fa-sm') . '</a>';
             }
 
             $message_list[] = $message;
+
             $i++;
         }
 
@@ -1368,7 +1371,7 @@ class MessageManager
             $userImage = Display::img(
                 $fromUser['avatar_small'],
                 $name,
-                ['title' => $name, 'class' => 'img-responsive img-circle', 'style' => 'max-width:35px'],
+                ['title' => $name, 'class' => 'rounded-circle mr-2'],
                 false
             );
         }
@@ -2235,8 +2238,9 @@ class MessageManager
 
         $table->set_header(0, '', false, ['style' => 'width:15px;']);
         $table->set_header(1, get_lang('Messages'), false);
-        $table->set_header(2, get_lang('Date'), true, ['style' => 'width:180px;']);
-        $table->set_header(3, get_lang('Modify'), false, ['style' => 'width:70px;']);
+        $table->set_header(2, get_lang('Subject'), false);
+        $table->set_header(3, get_lang('Date'), true, ['style' => 'width:180px;']);
+        $table->set_header(4, get_lang('Modify'), false, ['style' => 'width:70px;']);
 
         $table->set_form_actions(['delete' => get_lang('DeleteSelectedMessages')]);
         $html .= $table->return_table();
diff --git a/main/messages/inbox.php b/main/messages/inbox.php
index 53547a6d2d..01623f83c5 100755
--- a/main/messages/inbox.php
+++ b/main/messages/inbox.php
@@ -64,12 +64,12 @@ if (isset($_GET['form_reply']) || isset($_GET['form_delete'])) {
         if (isset($user_reply) && !is_null($user_id_by_email) && strlen($info_reply[0]) > 0) {
             MessageManager::send_message($user_id_by_email, $title, $content);
             $show_message .= MessageManager::return_message($user_id_by_email, 'confirmation');
-            $social_right_content .= MessageManager::inbox_display();
+            $message_content .= MessageManager::inbox_display();
             exit;
         } elseif (is_null($user_id_by_email)) {
             $message_box = get_lang('ErrorSendingMessage');
             $show_message .= Display::return_message(api_xml_http_response_encode($message_box), 'error');
-            $social_right_content .= MessageManager::inbox_display();
+            $message_content .= MessageManager::inbox_display();
             exit;
         }
     } elseif (trim($info_delete[0]) == 'delete') {
@@ -81,7 +81,7 @@ if (isset($_GET['form_reply']) || isset($_GET['form_delete'])) {
         }
         $message_box = get_lang('SelectedMessagesDeleted');
         $show_message .= Display::return_message(api_xml_http_response_encode($message_box));
-        $social_right_content .= MessageManager::inbox_display();
+        $message_content .= MessageManager::inbox_display();
         exit;
     }
 }
@@ -140,12 +140,12 @@ if ($allowSocial) {
 }*/
 
 // Right content
-$social_right_content = '';
+$message_content = '';
 
 //MAIN CONTENT
 
 if (!isset($_GET['del_msg'])) {
-    $social_right_content .= MessageManager::inbox_display($keyword);
+    $message_content .= MessageManager::inbox_display($keyword);
 } else {
     $num_msg = (int) $_POST['total'];
     for ($i = 0; $i < $num_msg; $i++) {
@@ -157,7 +157,7 @@ if (!isset($_GET['del_msg'])) {
             );
         }
     }
-    $social_right_content .= MessageManager::inbox_display();
+    $message_content .= MessageManager::inbox_display();
 }
 
 $tpl = new Template($nameTools);
@@ -166,16 +166,12 @@ if ($actions) {
     $tpl->assign('actions', Display::toolbarAction('toolbar', [$actions]));
 }
 // Block Social Avatar
-SocialManager::setSocialUserBlock($tpl, api_get_user_id(), 'messages');
+// SocialManager::setSocialUserBlock($tpl, api_get_user_id(), 'messages');
 
-$tpl->assign('content_inbox', $social_right_content);
-$social_layout = $tpl->get_template('social/inbox.tpl');
+$tpl->assign('content_inbox', $message_content);
+$social_layout = $tpl->get_template('message/inbox.tpl');
 $content = $tpl->fetch($social_layout);
 $tpl->assign('message', $show_message);
 $tpl->assign('content', $content);
 $tpl->display_one_col_template();
 
-
-    //$tpl->assign('message', $show_message);
-    //$tpl->display_one_col_template();
-
diff --git a/main/messages/new_message.php b/main/messages/new_message.php
index 10453e50f7..c982927ee5 100755
--- a/main/messages/new_message.php
+++ b/main/messages/new_message.php
@@ -49,9 +49,10 @@ function add_image_form() {
     }
 }
 </script>';
+
 $nameTools = get_lang('ComposeMessage');
 
-$tpl = new Template(get_lang('ComposeMessage'));
+$tpl = new Template($nameTools);
 
 /**
  * Shows the compose area + a list of users to select from.
@@ -338,57 +339,37 @@ $interbreadcrumb[] = [
 ];
 
 $group_id = isset($_REQUEST['group_id']) ? (int) $_REQUEST['group_id'] : 0;
-$social_right_content = null;
+$message_content = null;
+$actions = null;
 if ($group_id != 0) {
-    $social_right_content .= '<div class=actions>';
-    $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/social/group_view.php?id='.$group_id.'">'.
-        Display::return_icon('back.png', api_xml_http_response_encode(get_lang('ComposeMessage'))).'</a>';
-    $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php?group_id='.$group_id.'">'.
-        Display::return_icon('message_new.png', api_xml_http_response_encode(get_lang('ComposeMessage'))).'</a>';
-    $social_right_content .= '</div>';
+    $actions .= '<a href="'.api_get_path(WEB_PATH).'main/social/group_view.php?id='.$group_id.'">'.
+        Display::return_icon('back.png', api_xml_http_response_encode(get_lang('ComposeMessage')),null, ICON_SIZE_MEDIUM).'</a>';
+    $actions .= '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php?group_id='.$group_id.'">'.
+        Display::return_icon('message_new.png', api_xml_http_response_encode(get_lang('ComposeMessage')), null, ICON_SIZE_MEDIUM).'</a>';
+
 } else {
-    if ($allowSocial) {
-    } else {
-        $social_right_content .= '<div class=actions>';
-        if (api_get_setting('allow_message_tool') === 'true') {
-            $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php">'.
-                Display::return_icon('message_new.png', get_lang('ComposeMessage')).'</a>';
-            $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.
-                Display::return_icon('inbox.png', get_lang('Inbox')).'</a>';
-            $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php">'.
-                Display::return_icon('outbox.png', get_lang('Outbox')).'</a>';
-        }
-        $social_right_content .= '</div>';
+    $actions .= '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.
+        Display::return_icon('back.png', get_lang('Back'), null, ICON_SIZE_MEDIUM).'</a>';
+    if (api_get_setting('allow_message_tool') === 'true') {
+        $actions .= '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.
+            Display::return_icon('inbox.png', get_lang('Inbox'), null, ICON_SIZE_MEDIUM).'</a>';
+        $actions .= '<a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php">'.
+            Display::return_icon('outbox.png', get_lang('Outbox'), null, ICON_SIZE_MEDIUM).'</a>';
     }
 }
-
-// LEFT COLUMN
-$social_left_content = '';
-if ($allowSocial) {
-    // Block Social Menu
-    $social_menu_block = SocialManager::show_social_menu('messages');
-    $social_right_content .= '<div class="row">';
-    $social_right_content .= '<div class="col-md-12">';
-    $social_right_content .= '<div class="actions">';
-    $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.
-        Display::return_icon('back.png', get_lang('Back'), [], 32).'</a>';
-    $social_right_content .= '</div>';
-    $social_right_content .= '</div>';
-    $social_right_content .= '<div class="col-md-12">';
-}
-
+$show_message = null;
 // MAIN CONTENT
 if (!isset($_POST['compose'])) {
     if (isset($_GET['re_id'])) {
-        $social_right_content .= show_compose_reply_to_message(
+        $message_content .= show_compose_reply_to_message(
             $_GET['re_id'],
             api_get_user_id(),
             $tpl
         );
     } elseif (isset($_GET['send_to_user'])) {
-        $social_right_content .= show_compose_to_user($_GET['send_to_user'], $tpl);
+        $message_content .= show_compose_to_user($_GET['send_to_user'], $tpl);
     } else {
-        $social_right_content .= show_compose_to_any($tpl);
+        $message_content .= show_compose_to_any($tpl);
     }
 } else {
     $restrict = false;
@@ -405,7 +386,7 @@ if (!isset($_POST['compose'])) {
 
     // comes from a reply button
     if (isset($_GET['re_id']) || isset($_GET['forward_id'])) {
-        $social_right_content .= manageForm($default, null, null, $tpl);
+        $message_content .= manageForm($default, null, null, $tpl);
     } else {
         // post
         if ($restrict) {
@@ -417,29 +398,25 @@ if (!isset($_POST['compose'])) {
             if (isset($_POST['hidden_user'])) {
                 $default['users'] = [$_POST['hidden_user']];
             }
-            $social_right_content .= manageForm($default, null, null, $tpl);
+            $message_content .= manageForm($default, null, null, $tpl);
         } else {
-            $social_right_content .= Display::return_message(get_lang('ErrorSendingMessage'), 'error');
+            $show_message = Display::return_message(get_lang('ErrorSendingMessage'), 'error');
         }
     }
 }
 
-if ($allowSocial) {
-    $social_right_content .= '</div>';
-    $social_right_content .= '</div>';
-}
-
-// Block Social Avatar
-SocialManager::setSocialUserBlock($tpl, api_get_user_id(), 'messages');
-
 MessageManager::cleanAudioMessage();
-if ($allowSocial) {
-    $tpl->assign('social_menu_block', $social_menu_block);
-    $tpl->assign('social_right_content', $social_right_content);
-    $social_layout = $tpl->get_template('social/inbox.tpl');
-    $tpl->display($social_layout);
-} else {
-    $content = $social_right_content;
-    $tpl->assign('content', $content);
-    $tpl->display_one_col_template();
+
+if ($actions) {
+    $tpl->assign(
+        'actions',
+        Display::toolbarAction('toolbar', [$actions])
+    );
 }
+$tpl->assign('message', $show_message);
+$tpl->assign('content_inbox', $message_content);
+$social_layout = $tpl->get_template('message/inbox.tpl');
+$content = $tpl->fetch($social_layout);
+$tpl->assign('content', $content);
+$tpl->display_one_col_template();
+
diff --git a/main/messages/outbox.php b/main/messages/outbox.php
index 837fc41602..a50a0f256d 100755
--- a/main/messages/outbox.php
+++ b/main/messages/outbox.php
@@ -15,6 +15,7 @@ if (api_get_setting('allow_message_tool') != 'true') {
 
 $allowSocial = api_get_setting('allow_social_tool') == 'true';
 $allowMessage = api_get_setting('allow_message_tool') == 'true';
+$show_message = null;
 
 if (isset($_GET['messages_page_nr'])) {
     if ($allowSocial && $allowMessage) {
@@ -39,40 +40,40 @@ $interbreadcrumb[] = [
     'name' => get_lang('Messages'),
 ];
 
-$actions = '';
+$actions = null;
 if ($allowMessage) {
-    $actions .= '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php">'.
-        Display::return_icon('message_new.png', get_lang('ComposeMessage')).'</a>';
-    $actions .= '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.
-        Display::return_icon('inbox.png', get_lang('Inbox')).'</a>';
-    $actions .= '<a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php">'.
-        Display::return_icon('outbox.png', get_lang('Outbox')).'</a>';
+    $actionsLeft = '<a href="' . api_get_path(WEB_PATH) . 'main/messages/inbox.php">' .
+        Display::return_icon('back.png', get_lang('Back'), null, ICON_SIZE_MEDIUM) . '</a>';
+    $actionsLeft .= '<a href="' . api_get_path(WEB_PATH) . 'main/messages/new_message.php">' .
+        Display::return_icon('new-message.png', get_lang('ComposeMessage'), null, ICON_SIZE_MEDIUM) . '</a>';
+    $actionsLeft .= '<a href="' . api_get_path(WEB_PATH) . 'main/messages/inbox.php">' .
+        Display::return_icon('inbox.png', get_lang('Inbox'), null, ICON_SIZE_MEDIUM) . '</a>';
+    $actionsLeft .= '<a href="' . api_get_path(WEB_PATH) . 'main/messages/outbox.php">' .
+        Display::return_icon('outbox.png', get_lang('Outbox'), null, ICON_SIZE_MEDIUM) . '</a>';
+
+    $form = MessageManager::getSearchForm(api_get_path(WEB_PATH) . 'main/messages/outbox.php');
+    if ($form->validate()) {
+        $values = $form->getSubmitValues();
+        $keyword = $values['keyword'];
+    }
+    $actionsRight = $form->returnForm();
 }
 
 $action = null;
+
 if (isset($_REQUEST['action'])) {
     $action = $_REQUEST['action'];
 }
 
 $keyword = '';
-$social_right_content = '';
-if ($allowSocial) {
-    // Block Social Menu
-    $social_menu_block = SocialManager::show_social_menu('messages');
-    $actionsLeft = '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.
-        Display::return_icon('back.png', get_lang('Back'), [], 32).'</a>';
+$message_content = null;
+
+
+$actions .= Display::toolbarAction(
+    'toolbar',
+    [$actionsLeft, $actionsRight]
+);
 
-    $form = MessageManager::getSearchForm(api_get_path(WEB_PATH).'main/messages/outbox.php');
-    if ($form->validate()) {
-        $values = $form->getSubmitValues();
-        $keyword = $values['keyword'];
-    }
-    $actionsRight = $form->returnForm();
-    $social_right_content .= Display::toolbarAction(
-        'toolbar',
-        [$actionsLeft, $actionsRight]
-    );
-}
 //MAIN CONTENT
 if ($action == 'delete') {
     $delete_list_id = [];
@@ -83,40 +84,37 @@ if ($action == 'delete') {
         $delete_list_id = $_POST['id'];
     }
     for ($i = 0; $i < count($delete_list_id); $i++) {
-        MessageManager::delete_message_by_user_sender(
+        $show_message .= MessageManager::delete_message_by_user_sender(
             api_get_user_id(),
             $delete_list_id[$i]
         );
     }
     $delete_list_id = [];
-    $social_right_content .= MessageManager::outbox_display($keyword);
+    $message_content .= MessageManager::outbox_display($keyword);
 } elseif ($action == 'deleteone') {
     $delete_list_id = [];
     $id = Security::remove_XSS($_GET['id']);
     MessageManager::delete_message_by_user_sender(api_get_user_id(), $id);
     $delete_list_id = [];
-    $social_right_content .= MessageManager::outbox_display($keyword);
+    $message_content .= MessageManager::outbox_display($keyword);
 } else {
-    $social_right_content .= MessageManager::outbox_display($keyword);
+    $message_content .= MessageManager::outbox_display($keyword);
 }
 
 $tpl = new Template(get_lang('Outbox'));
 // Block Social Avatar
-SocialManager::setSocialUserBlock($tpl, api_get_user_id(), 'messages');
 
-if ($allowSocial) {
-    $tpl->assign('social_menu_block', $social_menu_block);
-    $tpl->assign('social_right_content', $social_right_content);
-    $social_layout = $tpl->get_template('social/inbox.tpl');
-    $tpl->display($social_layout);
-} else {
-    $content = $social_right_content;
-    if ($actions) {
-        $tpl->assign(
-            'actions',
-            Display::toolbarAction('toolbar', [$actions])
-        );
-    }
-    $tpl->assign('content', $content);
-    $tpl->display_one_col_template();
+if ($actions) {
+    $tpl->assign(
+        'actions',
+        Display::toolbarAction('toolbar', [$actions])
+    );
 }
+
+$tpl->assign('content_inbox', $message_content);
+$social_layout = $tpl->get_template('message/inbox.tpl');
+$content = $tpl->fetch($social_layout);
+$tpl->assign('message', $show_message);
+$tpl->assign('content', $content);
+$tpl->display_one_col_template();
+
diff --git a/main/messages/view_message.php b/main/messages/view_message.php
index 0aaa536ee2..8e93befc64 100755
--- a/main/messages/view_message.php
+++ b/main/messages/view_message.php
@@ -24,16 +24,22 @@ if ($allowSocial) {
 }
 $interbreadcrumb[] = ['url' => 'inbox.php', 'name' => get_lang('Messages')];
 
-$social_right_content = '<div class="actions">';
+$actions = null;
+
 if (api_get_setting('allow_message_tool') === 'true') {
-    $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php">'.
-        Display::return_icon('new-message.png', get_lang('ComposeMessage')).'</a>';
-    $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.
-        Display::return_icon('inbox.png', get_lang('Inbox')).'</a>';
-    $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php">'.
-        Display::return_icon('outbox.png', get_lang('Outbox')).'</a>';
+    $actionsLeft = '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php">'.
+        Display::return_icon('new-message.png', get_lang('ComposeMessage'), null,ICON_SIZE_MEDIUM).'</a>';
+    $actionsLeft .= '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.
+        Display::return_icon('inbox.png', get_lang('Inbox'), null, ICON_SIZE_MEDIUM).'</a>';
+    $actionsLeft .= '<a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php">'.
+        Display::return_icon('outbox.png', get_lang('Outbox'), null, ICON_SIZE_MEDIUM).'</a>';
 }
-$social_right_content .= '</div>';
+
+
+$actions .= Display::toolbarAction(
+    'toolbar',
+    [$actionsLeft]
+);
 
 if (empty($_GET['id'])) {
     $messageId = $_GET['id_send'];
@@ -45,33 +51,26 @@ if (empty($_GET['id'])) {
     $show_menu = 'messages_inbox';
 }
 
-$message = '';
 
-// LEFT COLUMN
-if (api_get_setting('allow_social_tool') === 'true') {
-    // Block Social Menu
-    $social_menu_block = SocialManager::show_social_menu($show_menu);
-}
 // MAIN CONTENT
-$message .= MessageManager::showMessageBox($messageId, $source);
+$message_content = MessageManager::showMessageBox($messageId, $source);
 
-if (!empty($message)) {
-    $social_right_content .= $message;
-} else {
+if (empty($message_content)) {
     api_not_allowed(true);
 }
+
 $tpl = new Template(get_lang('View'));
-// Block Social Avatar
-SocialManager::setSocialUserBlock($tpl, api_get_user_id(), $show_menu);
-
-if (api_get_setting('allow_social_tool') === 'true') {
-    $tpl->assign('social_menu_block', $social_menu_block);
-    $tpl->assign('social_right_content', $social_right_content);
-    $social_layout = $tpl->get_template('social/inbox.tpl');
-    $tpl->display($social_layout);
-} else {
-    $content = $social_right_content;
 
-    $tpl->assign('content', $content);
-    $tpl->display_one_col_template();
+if ($actions) {
+    $tpl->assign(
+        'actions',
+        Display::toolbarAction('toolbar', [$actions])
+    );
 }
+
+$tpl->assign('content_inbox', $message_content);
+$social_layout = $tpl->get_template('message/inbox.tpl');
+$content = $tpl->fetch($social_layout);
+$tpl->assign('content', $content);
+$tpl->display_one_col_template();
+
diff --git a/main/template/default/social/inbox.html.twig b/main/template/default/message/inbox.html.twig
similarity index 100%
rename from main/template/default/social/inbox.html.twig
rename to main/template/default/message/inbox.html.twig
diff --git a/public/img/icons/32/outbox.png b/public/img/icons/32/outbox.png
index c056e7f649..b58954cb2c 100644
Binary files a/public/img/icons/32/outbox.png and b/public/img/icons/32/outbox.png differ
diff --git a/public/img/icons/svg/outbox.svg b/public/img/icons/svg/outbox.svg
index 4ef30a2392..d98c758e19 100644
--- a/public/img/icons/svg/outbox.svg
+++ b/public/img/icons/svg/outbox.svg
@@ -11,9 +11,9 @@
    height="128"
    version="1.1"
    width="128"
-viewBox="0 0 128 128"
+   viewBox="0 0 128 128"
    id="svg2"
-   inkscape:version="0.91 r"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
    sodipodi:docname="outbox.svg">
   <metadata
      id="metadata18">
@@ -61,56 +61,74 @@ viewBox="0 0 128 128"
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1051"
+     inkscape:window-width="1366"
+     inkscape:window-height="713"
      id="namedview14"
      showgrid="false"
-     inkscape:zoom="1.7383042"
-     inkscape:cx="42.662409"
-     inkscape:cy="25.439635"
-     inkscape:window-x="1366"
-     inkscape:window-y="0"
+     inkscape:zoom="2.5111491"
+     inkscape:cx="76.494816"
+     inkscape:cy="51.389655"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg2" />
-  <rect
-     y="4.7115331"
-     x="4.1345963"
-     height="118.86627"
-     width="118.86627"
-     id="rect14306"
-     style="opacity:0;fill:#ffffff;fill-opacity:0.99215686;stroke:none" />
-  <path
-     style="fill:#93a7ac;fill-opacity:1;stroke:none"
-     d="m 22.690507,45.908695 80.198793,0 18.09727,44.344488 -25.154834,21.790127 -62.10933,0.83722 L 7.1618176,90.047941 Z"
-     id="rect14227"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ccccccc" />
-  <path
-     style="fill:#afdde9;stroke:none"
-     d="M 30.128405,51.100892 97.733596,51.34853 115.06826,92.951725 94.656862,109.1637 36.813524,106.0561 13.041379,92.456449 Z"
-     id="path14236"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ccccccc" />
-  <path
-     style="fill:#004455;fill-opacity:1;stroke:none"
-     d="m 10.812637,72.150128 26.497272,0 c -3.043412,32.624552 49.198749,46.184262 52.746908,0 l 27.735463,0 0,43.584302 -106.979643,0 z"
-     id="rect14233"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ccccccc" />
-  <path
-     inkscape:connector-curvature="0"
-     style="fill:#006680;fill-opacity:1"
-     d="m 104.42799,38.53023 -8.306894,0 18.572854,37.145709 -21.409676,0 c 0,16.410955 -13.305693,29.716531 -29.716568,29.716531 -16.410836,0 -29.716567,-13.305695 -29.716567,-29.716531 l -21.409638,0 18.572854,-37.145709 -8.306929,0 -18.572855,37.145709 0,44.574851 118.866269,0 0,-44.574851 -18.57285,-37.145709 z"
-     id="path14221" />
-  <path
-     style="fill:#004455;fill-opacity:1;stroke:none"
-     d="m 22.624853,38.554122 81.665327,-0.17513 -4.1369,8.054894 -73.697961,0.08756 z"
-     id="rect14230"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ccccc" />
-  <path
-     style="fill:url(#linearGradient21217);fill-opacity:1"
-     d="m 62.517087,2.0385748 -29.716568,29.7165682 14.858284,0 0,44.574851 29.716567,0 0,-44.574851 14.858284,0 L 62.517087,2.0385748 Z"
-     id="path14225"
-     inkscape:connector-curvature="0" />
+  <g
+     id="g865"
+     transform="matrix(1,0,0,0.99353159,-3.5668507,4.0374467)"
+     inkscape:export-filename="/var/www/chamilo2/public/img/icons/32/outbox.png"
+     inkscape:export-xdpi="24"
+     inkscape:export-ydpi="24">
+    <rect
+       y="-3.6470594"
+       x="3.5668507"
+       height="128"
+       width="128"
+       id="rect834"
+       style="opacity:0;fill:#ffaaaa;fill-opacity:1;stroke:none;stroke-width:1.93174791;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <g
+       transform="matrix(1.0600145,0,0,1.0600145,0.18414607,-6.2246514)"
+       id="g832">
+      <rect
+         y="4.7115331"
+         x="4.1345963"
+         height="118.86627"
+         width="118.86627"
+         id="rect14306"
+         style="opacity:0;fill:#ffffff;fill-opacity:0.99215686;stroke:none" />
+      <path
+         style="fill:#93a7ac;fill-opacity:1;stroke:none"
+         d="M 22.690507,45.908695 H 102.8893 L 120.98657,90.253183 95.831736,112.04331 33.722406,112.88053 7.1618176,90.047941 Z"
+         id="rect14227"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         style="fill:#afdde9;stroke:none"
+         d="M 30.128405,51.100892 97.733596,51.34853 115.06826,92.951725 94.656862,109.1637 36.813524,106.0561 13.041379,92.456449 Z"
+         id="path14236"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         style="fill:#004455;fill-opacity:1;stroke:none"
+         d="m 10.812637,72.150128 h 26.497272 c -3.043412,32.624552 49.198749,46.184262 52.746908,0 H 117.79228 V 115.73443 H 10.812637 Z"
+         id="rect14233"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#006680;fill-opacity:1"
+         d="M 104.42799,38.53023 H 96.121096 L 114.69395,75.675939 H 93.284274 c 0,16.410955 -13.305693,29.716531 -29.716568,29.716531 -16.410836,0 -29.716567,-13.305695 -29.716567,-29.716531 H 12.441501 L 31.014355,38.53023 H 22.707426 L 4.134571,75.675939 V 120.25079 H 123.00084 V 75.675939 Z"
+         id="path14221" />
+      <path
+         style="fill:#004455;fill-opacity:1;stroke:none"
+         d="m 22.624853,38.554122 81.665327,-0.17513 -4.1369,8.054894 -73.697961,0.08756 z"
+         id="rect14230"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="fill:url(#linearGradient21217);fill-opacity:1"
+         d="M 62.517087,2.0385748 32.800519,31.755143 H 47.658803 V 76.329994 H 77.37537 V 31.755143 h 14.858284 z"
+         id="path14225"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
 </svg>