diff --git a/main/messages/inbox.php b/main/messages/inbox.php
index 19b9620d78..2c3d9a9edd 100755
--- a/main/messages/inbox.php
+++ b/main/messages/inbox.php
@@ -158,15 +158,12 @@ echo '<div id="social-content">';
 	}
 
 	echo '<div id="'.$id_content_right.'">';    
-    if (api_get_setting('allow_social_tool') == 'true') {        
-    	echo '<div class="social-box-container2">';				
+    if (api_get_setting('allow_social_tool') == 'true') {
     	echo '<div class="actions">';				
     		echo '<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>';
             echo '<a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php?f=social">'.Display::return_icon('outbox.png', get_lang('Outbox'), array(), 32).'</a>';                        
     	echo '</div>';
-    					
-    	//echo '<div>'.Display::return_icon('content-post-group1.jpg',get_lang('Inbox')).'</div>';
-    	//echo '<div id="div_content_table" class="social-box-content2">';
+    		
     }	
     //MAIN CONTENT
     if (!isset($_GET['del_msg'])) {
@@ -180,11 +177,7 @@ echo '<div id="social-content">';
     		}
     	}
     	inbox_display();
-    }
-    if (api_get_setting('allow_social_tool') == 'true'){
-    	echo '</div>';				
-    	//echo '</div>';
-    }			
+    }    
 	echo '</div>';	
 echo '</div>';
 
diff --git a/main/messages/new_message.php b/main/messages/new_message.php
index d562835155..23762ff84d 100755
--- a/main/messages/new_message.php
+++ b/main/messages/new_message.php
@@ -348,13 +348,10 @@ echo '<div id="social-content">';
 	echo '<div id="'.$id_content_right.'">';
 	
 		//MAIN CONTENT
-		if (api_get_setting('allow_social_tool') == 'true'){
-			echo '<div class="social-box-container2">';			
+		if (api_get_setting('allow_social_tool') == 'true') {			
             echo '<div class="actions">';              
             echo '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.Display::return_icon('back.png', get_lang('Back'), array(), 32).'</a>';
             echo '</div>';
-			//echo '<div>'.Display::return_icon('content-post-group1.jpg',get_lang('ComposeMessage')).'</div>';
-			//echo '<div id="div_content_table" class="social-box-content2">';
 		}
 		if (!isset($_POST['compose'])) {
 			if(isset($_GET['re_id'])) {
@@ -365,7 +362,6 @@ echo '<div id="social-content">';
 				show_compose_to_any($_user['user_id']);
 		  	}
 		} else {
-
 			$restrict = false;
 			if (isset($_POST['users'])) {
 				$restrict = true;
@@ -398,9 +394,6 @@ echo '<div id="social-content">';
 				}
 			}
 		}
-		if (api_get_setting('allow_social_tool') == 'true'){
-            echo '</div>';		    
-		}
 	echo '</div>';
 echo '</div>';
 
diff --git a/main/messages/outbox.php b/main/messages/outbox.php
index 7f9b12a517..f10e6cf201 100755
--- a/main/messages/outbox.php
+++ b/main/messages/outbox.php
@@ -141,8 +141,7 @@ echo '<div id="social-content">';
 	}
 	
 	echo '<div id="'.$id_content_right.'">';
-			if (api_get_setting('allow_social_tool') == 'true') {
-				echo '<div class="social-box-container2">';         
+			if (api_get_setting('allow_social_tool') == 'true') {				    
                 echo '<div class="actions">';              
                 echo '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.Display::return_icon('back.png', get_lang('Back'), array(), 32).'</a>';
                 echo '</div>';
@@ -168,13 +167,9 @@ echo '<div id="social-content">';
 				MessageManager::delete_message_by_user_sender(api_get_user_id(),$id);
 				$delete_list_id=array();
 				outbox_display();
-			}else {
+			} else {
 				outbox_display();
 			}
-			if (api_get_setting('allow_social_tool') == 'true'){
-				echo '</div>';
-				//echo '</div>';
-			}
 	echo '</div>';
 echo '</div>';
 
diff --git a/main/messages/view_message.php b/main/messages/view_message.php
index 91916a9a0a..59099fd891 100755
--- a/main/messages/view_message.php
+++ b/main/messages/view_message.php
@@ -62,14 +62,7 @@ echo '<div id="social-content">';
 	$id_content_right = '';
 	//LEFT COLUMN
 	if (api_get_setting('allow_social_tool') != 'true') { 
-		$id_content_right = 'inbox';
-		/*echo '<div id="inbox-menu" class="actions">';
-		echo '<ul>';
-			echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php">'.Display::return_icon('message_new.png',get_lang('ComposeMessage')).get_lang('ComposeMessage').'</a>'.'</li>';
-			echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.Display::return_icon('inbox.png',get_lang('Inbox')).get_lang('Inbox').'</a>'.'</li>';			
-			echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php">'.Display::return_icon('outbox.png',get_lang('Outbox')).get_lang('Outbox').'</a>'.'</li>';
-		echo '</ul>';
-		echo '</div>';*/
+		$id_content_right = 'inbox';	
 	} else {
 		require_once api_get_path(LIBRARY_PATH).'social.lib.php';
 		$id_content_right = 'social-content-right';
@@ -79,24 +72,15 @@ echo '<div id="social-content">';
 		echo '</div>';				
 	}
 
-	echo '<div id="'.$id_content_right.'">';
-	if (api_get_setting('allow_social_tool') == 'true'){
-		echo '<div class="social-box-container2">';				
-		//echo '<div>'.Display::return_icon('content-post-group1.jpg',get_lang('View')).'</div>';
-		//echo '<div id="div_content_table" class="social-box-content2">';
+	echo '<div id="'.$id_content_right.'">';	
+	//MAIN CONTENT
+	$message = MessageManager::show_message_box($id_message,$source);
+	
+	if (!empty($message)) {
+		echo $message;
+	} else {
+		api_not_allowed();
 	}	
-		//MAIN CONTENT
-		$message = MessageManager::show_message_box($id_message,$source);
-		
-		if (!empty($message)) {
-			echo $message;
-		} else {
-			api_not_allowed();
-		}
-	if (api_get_setting('allow_social_tool') == 'true'){
-		echo '</div>';
-		//echo '</div>';
-	}
 	echo '</div>';
 echo '</div>';