diff --git a/main/auth/profile.php b/main/auth/profile.php
index 344e9e2ce7..d5c11588c7 100755
--- a/main/auth/profile.php
+++ b/main/auth/profile.php
@@ -267,7 +267,7 @@ if (api_get_setting('extended_profile') == 'true') {
 
 		//	MY PRODUCTIONS
 		$form->addElement('file', 'production', get_lang('MyProductions'));
-		if ($production_list = UserManager::build_production_list($_user['user_id'], '', true)) {
+		if ($production_list = UserManager::build_production_list(api_get_user_id(), '', true)) {
 			$form->addElement('static', 'productions_list', null, $production_list);
 		}
 		//	MY PERSONAL OPEN AREA
@@ -525,7 +525,7 @@ function upload_user_production($user_id) {
  */
 function check_user_password($password){
 	global $_user;
-	$user_id = $_user['user_id'];
+	$user_id = api_get_user_id();
 	if ($user_id != strval(intval($user_id)) || empty($password)) { return false; }
 	$table_user = Database :: get_main_table(TABLE_MAIN_USER);
 	$password = api_get_encrypted_password($password);
@@ -541,7 +541,7 @@ function check_user_password($password){
  */
 function check_user_email($email){
 	global $_user;
-	$user_id = $_user['user_id'];
+	$user_id = api_get_user_id();
 	if ($user_id != strval(intval($user_id)) || empty($email)) { return false; }
 	$table_user = Database :: get_main_table(TABLE_MAIN_USER);
 	$sql_password = "SELECT * FROM $table_user WHERE user_id='".$user_id."' AND email='".$email."'";
@@ -608,24 +608,24 @@ if ($form->validate()) {
 	}
 
 	// upload picture if a new one is provided
-	if ($_FILES['picture']['size']) {
-		if ($new_picture = UserManager::update_user_picture($_user['user_id'], $_FILES['picture']['name'], $_FILES['picture']['tmp_name'])) {
+	if ($_FILES['picture']['size']) {	 
+		if ($new_picture = UserManager::update_user_picture(api_get_user_id(), $_FILES['picture']['name'], $_FILES['picture']['tmp_name'])) {
 			$user_data['picture_uri'] = $new_picture;
-			$_SESSION['image_uploaded'] = 'success';
+			$_SESSION['image_uploaded'] = 'success';			
 		}
 	}
 	// remove existing picture if asked
 	elseif (!empty($user_data['remove_picture'])) {
-		UserManager::delete_user_picture($_user['user_id']);
+		UserManager::delete_user_picture(api_get_user_id());
 		$user_data['picture_uri'] = '';
 	}
 	
 	//Remove production	
 	if (is_array($user_data['remove_production'])) {
 		foreach (array_keys($user_data['remove_production']) as $production) {
-			UserManager::remove_user_production($_user['user_id'], urldecode($production));
+			UserManager::remove_user_production(api_get_user_id(), urldecode($production));
 		}
-		if ($production_list = UserManager::build_production_list($_user['user_id'], true, true)) {			
+		if ($production_list = UserManager::build_production_list(api_get_user_id(), true, true)) {			
 			$form->insertElementBefore($form->createElement('static', null, null, $production_list), 'productions_list');
 		}
 		$form->removeElement('productions_list');
@@ -635,7 +635,7 @@ if ($form->validate()) {
 
 	// upload production if a new one is provided
 	if ($_FILES['production']['size']) {
-		$res = upload_user_production($_user['user_id']);
+		$res = upload_user_production(api_get_user_id());
 		if (!$res) {
 			//it's a bit excessive to assume the extension is the reason why upload_user_production() returned false, but it's true in most cases
 			$filtered_extension = true;
@@ -695,7 +695,7 @@ if ($form->validate()) {
 		// remove trailing , from the query we have so far
 		$sql = rtrim($sql, ',');
 	}
-	$sql .= " WHERE user_id  = '".$_user['user_id']."'";
+	$sql .= " WHERE user_id  = '".api_get_user_id()."'";
 	Database::query($sql);
 
 	// User tag process
@@ -711,7 +711,7 @@ if ($form->validate()) {
 	if (is_array($extras) && count($extras)> 0) {
 		foreach ($extras as $key => $value) {
 			//3. Tags are process in the UserManager::update_extra_field_value by the UserManager::process_tags function
-			$myres = UserManager::update_extra_field_value($_user['user_id'], $key, $value);
+			$myres = UserManager::update_extra_field_value(api_get_user_id(), $key, $value);
 		}
 	}
 
diff --git a/main/css/chamilo/default.css b/main/css/chamilo/default.css
index edcb1f0a56..12429232f2 100755
--- a/main/css/chamilo/default.css
+++ b/main/css/chamilo/default.css
@@ -4149,7 +4149,7 @@ div.image-social-content center.friend {
 .social-background-content {
     z-index:5;
     position:relative;
-    border:1px dotted #DDDDDD;
+    /* border:1px dotted #DDDDDD; */
     width:170px;
     overflow:hidden;
 }
diff --git a/main/css/chamilo_electric_blue/default.css b/main/css/chamilo_electric_blue/default.css
index b5c9badadf..7e76f13a2c 100755
--- a/main/css/chamilo_electric_blue/default.css
+++ b/main/css/chamilo_electric_blue/default.css
@@ -4128,7 +4128,7 @@ div.image-social-content center.friend {
 .social-background-content {
     z-index:5;
     position:relative;
-    border:1px dotted #DDDDDD;
+    /*border:1px dotted #DDDDDD;*/
     width:170px;
     overflow:hidden;
 }
diff --git a/main/css/chamilo_green/default.css b/main/css/chamilo_green/default.css
index d24230ded7..7507cf4e41 100755
--- a/main/css/chamilo_green/default.css
+++ b/main/css/chamilo_green/default.css
@@ -4143,7 +4143,7 @@ div.image-social-content center.friend {
 .social-background-content {
     z-index:5;
     position:relative;
-    border:1px dotted #DDDDDD;
+    /*border:1px dotted #DDDDDD;*/
     width:170px;
     overflow:hidden;
 }
diff --git a/main/css/chamilo_orange/default.css b/main/css/chamilo_orange/default.css
index f33d1d06e8..5a75ad20d4 100755
--- a/main/css/chamilo_orange/default.css
+++ b/main/css/chamilo_orange/default.css
@@ -4119,7 +4119,7 @@ div.image-social-content center.friend {
 .social-background-content {
     z-index:5;
     position:relative;
-    border:1px dotted #DDDDDD;
+    /*border:1px dotted #DDDDDD; */
     width:170px;
     overflow:hidden;
 }
diff --git a/main/css/chamilo_red/default.css b/main/css/chamilo_red/default.css
index 043efe8b5d..7889d38a08 100755
--- a/main/css/chamilo_red/default.css
+++ b/main/css/chamilo_red/default.css
@@ -4129,7 +4129,7 @@ div.image-social-content center.friend {
 .social-background-content {
     z-index:5;
     position:relative;
-    border:1px dotted #DDDDDD;
+    /*border:1px dotted #DDDDDD;*/
     width:170px;
     overflow:hidden;
 }
diff --git a/main/inc/lib/message.lib.php b/main/inc/lib/message.lib.php
index db25572ee9..735f9be5a0 100755
--- a/main/inc/lib/message.lib.php
+++ b/main/inc/lib/message.lib.php
@@ -175,7 +175,7 @@ class MessageManager
 				$message[1] = '<a onclick="get_action_url_and_show_messages(1,'.$result[0].')" href="javascript:void(0)">'.GetFullUserName($result[1]).'</a>';
 				$message[2] = '<a onclick="get_action_url_and_show_messages(1,'.$result[0].')" href="javascript:void(0)">'.str_replace("\\","",$result[2]).'</a>';
 				$message[4] = '<a onclick="reply_to_messages(\'show\','.$result[0].',\'\')" href="javascript:void(0)">'.Display::return_icon('message_reply.png',get_lang('ReplyToMessage')).'</a>'.
-						  '&nbsp;&nbsp;<a onclick="delete_one_message('.$result[0].')" href="javascript:void(0)"  >'.Display::return_icon('message_delete.png',get_lang('DeleteMessage')).'</a>';
+						  '&nbsp;&nbsp;<a onclick="delete_one_message('.$result[0].')" href="javascript:void(0)"  >'.Display::return_icon('delete.png',get_lang('DeleteMessage')).'</a>';
 			} else {
 				if($result[4]==1) {
 					$class = 'class = "unread"';
@@ -189,7 +189,7 @@ class MessageManager
 				$message[1] = '<a '.$class.' href="view_message.php?id='.$result[0].$link.'">'.GetFullUserName(($result[1])).'</a>';;
 				$message[2] = '<a '.$class.' href="view_message.php?id='.$result[0].$link.'">'.$result[2].'</a>';
 				$message[4] = '<a href="new_message.php?re_id='.$result[0].'&f='.Security::remove_XSS($_GET['f']).'">'.Display::return_icon('message_reply.png',get_lang('ReplyToMessage')).'</a>'.
-						  '&nbsp;&nbsp;<a delete_one_message('.$result[0].') href="inbox.php?action=deleteone&id='.$result[0].'&f='.Security::remove_XSS($_GET['f']).'">'.Display::return_icon('message_delete.png',get_lang('DeleteMessage')).'</a>';
+						  '&nbsp;&nbsp;<a delete_one_message('.$result[0].') href="inbox.php?action=deleteone&id='.$result[0].'&f='.Security::remove_XSS($_GET['f']).'">'.Display::return_icon('delete.png',get_lang('DeleteMessage')).'</a>';
 			}
 			$message[3] = $result[3]; //date stays the same
 			foreach($message as $key => $value) {
@@ -634,7 +634,7 @@ class MessageManager
 				$message[1] = '<a onclick="show_sent_message('.$result[0].')" href="javascript:void(0)">'.GetFullUserName($result[4]).'</a>';
 				$message[2] = '<a onclick="show_sent_message('.$result[0].')" href="javascript:void(0)">'.str_replace("\\","",$result[2]).'</a>';
 					$message[3] = $result[3]; //date stays the same
-				$message[4] = '&nbsp;&nbsp;<a onclick="delete_one_message_outbox('.$result[0].')" href="javascript:void(0)"  >'.Display::return_icon('message_delete.png',get_lang('DeleteMessage')).'</a>';
+				$message[4] = '&nbsp;&nbsp;<a onclick="delete_one_message_outbox('.$result[0].')" href="javascript:void(0)"  >'.Display::return_icon('delete.png',get_lang('DeleteMessage')).'</a>';
 			} else {
 				$link = '';
 				if ($_GET['f']=='social') {
@@ -643,7 +643,7 @@ class MessageManager
 				$message[1] = '<a '.$class.' onclick="show_sent_message ('.$result[0].')" href="../messages/view_message.php?id_send='.$result[0].$link.'">'.GetFullUserName($result[4]).'</a>';
 				$message[2] = '<a '.$class.' onclick="show_sent_message ('.$result[0].')" href="../messages/view_message.php?id_send='.$result[0].$link.'">'.$result[2].'</a>';
 					$message[3] = $result[3]; //date stays the same
-				$message[4] = '<a href="outbox.php?action=deleteone&id='.$result[0].'&f='.Security::remove_XSS($_GET['f']).'"  onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang('ConfirmDeleteMessage')))."'".')) return false;">'.Display::return_icon('message_delete.png',get_lang('DeleteMessage')).'</a>';
+				$message[4] = '<a href="outbox.php?action=deleteone&id='.$result[0].'&f='.Security::remove_XSS($_GET['f']).'"  onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang('ConfirmDeleteMessage')))."'".')) return false;">'.Display::return_icon('delete.png',get_lang('DeleteMessage')).'</a>';
 			}
 
 			foreach($message as $key => $value) {
@@ -712,7 +712,7 @@ class MessageManager
 		$row[5] = Security::remove_XSS($row[5]);
 
 		$message_content =  '
-		<table class="message_view_table">
+		<table>
 		    <tr>
 		      <td width=10>&nbsp; </td>
 		      <td vAlign=top width="100%">
@@ -745,29 +745,29 @@ class MessageManager
 
 		 $message_content .='</tr>
 		              <tr>
-		              <td>'.get_lang('Date').'&nbsp; '.$row[4].'</TD>
+		              <td>'.get_lang('Date').'&nbsp; '.$row[4].'</td>
 		              </tr>
 		            </tr>
 		        </table>
 		        <br />
-		        <table height=209 width="100%" bgColor=#ffffff>
+		        <table height=209 width="100%">
 		            <tr>
 		              <td vAlign=top class="view-message-content">'.str_replace("\\","",$row[6]).'</td>
 		            </tr>
 		        </table>
 		        <div id="message-attach">'.(!empty($files_attachments)?implode('&nbsp;|&nbsp;',$files_attachments):'').'</div>
-		        <div class=HT style="padding-bottom: 5px">';
+		        <div style="padding-bottom: 5px">';
 		    $social_link = '';
 		    if ($_GET['f'] == 'social') {
 		    	$social_link = 'f=social';
 		    }
 		    if ($source == 'outbox') {
-		    	$message_content .= '<a href="outbox.php?'.$social_link.'">'.Display::return_icon('back.png',get_lang('ReturnToOutbox')).get_lang('ReturnToOutbox').'</a> &nbsp';
+		    	$message_content .= '<a href="outbox.php?'.$social_link.'">'.Display::return_icon('back.png',get_lang('ReturnToOutbox')).'</a> &nbsp';
 		    } else {
-		    	$message_content .= '<a href="inbox.php?'.$social_link.'">'.Display::return_icon('back.png',get_lang('ReturnToInbox')).get_lang('ReturnToInbox').'</a> &nbsp';
-		    	$message_content .= '<a href="new_message.php?re_id='.$message_id.'&'.$social_link.'">'.Display::return_icon('message_reply.png',get_lang('ReplyToMessage')).get_lang('ReplyToMessage').'</a> &nbsp';
+		    	$message_content .= '<a href="inbox.php?'.$social_link.'">'.Display::return_icon('back.png',get_lang('ReturnToInbox')).'</a> &nbsp';
+		    	$message_content .= '<a href="new_message.php?re_id='.$message_id.'&'.$social_link.'">'.Display::return_icon('message_reply.png',get_lang('ReplyToMessage')).'</a> &nbsp';
 		    }
-			$message_content .= '<a href="inbox.php?action=deleteone&id='.$message_id.'&'.$social_link.'" >'.Display::return_icon('message_delete.png',get_lang('DeleteMessage')).''.get_lang('DeleteMessage').'</a>&nbsp';
+			$message_content .= '<a href="inbox.php?action=deleteone&id='.$message_id.'&'.$social_link.'" >'.Display::return_icon('delete.png',get_lang('DeleteMessage')).'</a>&nbsp';
 
 			$message_content .='</div></td>
 		      <td width=10></td>
@@ -807,7 +807,7 @@ class MessageManager
 				$band=1;
 		echo '<div class=actions>';
 		echo '<a onclick="close_and_open_outbox()" href="javascript:void(0)">'.Display::return_icon('folder_up.gif',api_xml_http_response_encode(get_lang('BackToOutbox'))).api_xml_http_response_encode(get_lang('BackToOutbox')).'</a>';
-		echo '<a onclick="delete_one_message_outbox('.$row[0].')" href="javascript:void(0)"  >'.Display::return_icon('message_delete.png',api_xml_http_response_encode(get_lang('DeleteMessage'))).api_xml_http_response_encode(get_lang('DeleteMessage')).'</a>';
+		echo '<a onclick="delete_one_message_outbox('.$row[0].')" href="javascript:void(0)"  >'.Display::return_icon('delete.png',api_xml_http_response_encode(get_lang('DeleteMessage'))).api_xml_http_response_encode(get_lang('DeleteMessage')).'</a>';
 		echo '</div><br />';
 		echo '
 		<table class="message_view_table" >
@@ -1067,15 +1067,13 @@ class MessageManager
 			$rs_file = Database::query($sql);
 			if (Database::num_rows($rs_file) > 0) {
 				$attach_icon = Display::return_icon('attachment.gif');
-
 				$archiveURL=api_get_path(WEB_CODE_PATH).'messages/download.php?type='.$type.'&file=';
-
 				while ($row_file = Database::fetch_array($rs_file)) {
 					$archiveFile= $row_file['path'];
 					$filename 	= $row_file['filename'];
 					$filesize 	= format_file_size($row_file['size']);
 					$filecomment= $row_file['comment'];
-					$links_attach_file[] = $attach_icon.'&nbsp;<a href="'.$archiveURL.$archiveFile.'">'.$filename.'</a>&nbsp;('.$filesize.')'.(!empty($filecomment)?'&nbsp;-&nbsp;'.$filecomment:'');
+					$links_attach_file[] = $attach_icon.'&nbsp;<a href="'.$archiveURL.$archiveFile.'">'.$filename.'</a>&nbsp;('.$filesize.')'.(!empty($filecomment)?'&nbsp;-&nbsp;<i>'.$filecomment.'</i>':'');
 				}
 			}
 		}
diff --git a/main/inc/lib/sortabletable.class.php b/main/inc/lib/sortabletable.class.php
index 02b99ba63e..fafbb19c79 100755
--- a/main/inc/lib/sortabletable.class.php
+++ b/main/inc/lib/sortabletable.class.php
@@ -302,7 +302,7 @@ class SortableTable extends HTML_Table {
 					.main-grid { width:100%;}
 					.sub-header { width:100%; padding-top: 10px; padding-right: 10px; padding-left: 10px; height:30px;}
 					.grid_container { width:100%;}
-					.grid_item { height: 120px; width:98px;  border:1px dotted #ccc; float:left; padding:5px; margin:8px;}
+					.grid_item { height: 120px; width:98px;  float:left; padding:5px; margin:8px;}
 					.grid_element_0 { width:100px; height: 100px; float:left; text-align:center; margin-bottom:5px;}
 					.grid_element_1 { width:100px; float:left; text-align:center;margin-bottom:5px;}
 					.grid_element_2 { width:150px; float:left;}
diff --git a/main/messages/view_message.php b/main/messages/view_message.php
index e61075dbde..cf9db10b89 100755
--- a/main/messages/view_message.php
+++ b/main/messages/view_message.php
@@ -13,11 +13,7 @@ if (api_get_setting('allow_message_tool')!='true'){
 }
 require_once api_get_path(LIBRARY_PATH).'message.lib.php';
 
-
-/*
-		HEADER
-*/
-//jquery thickbox already called from main/inc/header.inc.php
+/*		HEADER  */
 
 if ($_REQUEST['f']=='social') {
 	$this_section = SECTION_SOCIAL;