diff --git a/main/auth/profile.php b/main/auth/profile.php
index 517cebd58c..558e00cb91 100755
--- a/main/auth/profile.php
+++ b/main/auth/profile.php
@@ -725,10 +725,10 @@ $show_delete_account_button = api_get_setting('platform_unsubscribe_allowed') ==
 
 if (api_get_setting('allow_social_tool') == 'true') {
     echo '<div class="row-fluid">';
-        echo '<div class="span3">';
+        echo '<div class="col-md-3">';
         echo SocialManager::show_social_menu('home', null, api_get_user_id(), false, $show_delete_account_button);
         echo '</div>';
-        echo '<div class="span9">';
+        echo '<div class="col-md-9">';
         $form->display();
     echo '</div>';
 } else {
diff --git a/main/messages/inbox.php b/main/messages/inbox.php
index be7cb1d725..7fa1580d9e 100755
--- a/main/messages/inbox.php
+++ b/main/messages/inbox.php
@@ -18,6 +18,7 @@ if (isset($_GET['messages_page_nr'])) {
     }
     if (api_get_setting('allow_social_tool') == 'true' && api_get_setting('allow_message_tool') == 'true') {
         header('Location:inbox.php'.$social_link);
+        exit;
     }
 }
 if (api_get_setting('allow_message_tool') != 'true') {
@@ -137,7 +138,7 @@ if (api_get_setting('allow_social_tool') == 'true') {
 $social_right_content = null;
 
 if (api_get_setting('allow_social_tool') == 'true') {
-    $social_right_content .= '<div class="span9">';
+    $social_right_content .= '<div class="col-md-9">';
     $social_right_content .= '<div class="actions">';
     $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php?f=social">'.Display::return_icon('compose_message.png', get_lang('ComposeMessage'), array(), 32).'</a>';
     $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php?f=social">'.Display::return_icon('outbox.png', get_lang('Outbox'), array(), 32).'</a>';