diff --git a/main/admin/user_list.php b/main/admin/user_list.php
index 037bc6091e..6d427f5937 100755
--- a/main/admin/user_list.php
+++ b/main/admin/user_list.php
@@ -406,7 +406,7 @@ function get_user_data($from, $number_of_items, $column, $direction)
 	while ($user = Database::fetch_row($res)) {
 
 		$image_path = UserManager::get_user_picture_path_by_id($user[0], 'web', false, true);
-		$user_profile = UserManager::get_picture_user($user[0], $image_path['file'], 22, 'small_', ' width="22" height="22" ');
+		$user_profile = UserManager::get_picture_user($user[0], $image_path['file'], 22, USER_IMAGE_SIZE_SMALL, ' width="22" height="22" ');
 		if (!api_is_anonymous()) {
 			$photo = '<center><a href="'.api_get_path(WEB_PATH).'whoisonline.php?origin=user_list&id='.$user[0].'" title="'.get_lang('Info').'"  ><img src="'.$user_profile['file'].'" '.$user_profile['style'].' alt="'.api_get_person_name($user[2],$user[3]).'"  title="'.api_get_person_name($user[2], $user[3]).'" /></a></center>';
 		} else {
@@ -757,7 +757,7 @@ else
 	}
 
 				$image_path = UserManager::get_user_picture_path_by_id($user_id, 'web', false, true);
-				$user_profile = UserManager::get_picture_user($user_id, $image_path['file'], 22, 'small_', ' width="22" height="22" ');
+				$user_profile = UserManager::get_picture_user($user_id, $image_path['file'], 22, USER_IMAGE_SIZE_SMALL, ' width="22" height="22" ');
 				if (!api_is_anonymous()) {
 					$photo = '<center><a href="userInfo.php?'.api_get_cidreq().'&origin='.$origin.'&amp;uInfo='.$user_id.'" title="'.get_lang('Info').'"  ><img src="'.$user_profile['file'].'" '.$user_profile['style'].' alt="'.api_get_person_name($o_course_user['firstname'], $o_course_user['lastname']).'"  title="'.api_get_person_name($o_course_user['firstname'], $o_course_user['lastname']).'" /></a></center>';
 				} else {
diff --git a/main/forum/forumfunction.inc.php b/main/forum/forumfunction.inc.php
index 181cc29f36..82f2cd3654 100755
--- a/main/forum/forumfunction.inc.php
+++ b/main/forum/forumfunction.inc.php
@@ -2566,7 +2566,7 @@ function display_user_image($user_id,$name, $origin='') {
 		$image_path = UserManager::get_user_picture_path_by_id($user_id,'web',false, true);
 		$image_repository = $image_path['dir'];
 		$existing_image = $image_path['file'];
-		$friends_profile = UserManager::get_picture_user($user_id, $image_path['file'], 0, 'medium_' , 'width="96" height="96" ');
+		$friends_profile = UserManager::get_picture_user($user_id, $image_path['file'], 0, USER_IMAGE_SIZE_MEDIUM , 'width="96" height="96" ');
 		return 	$link.'<img src="'.$friends_profile['file'].'" '.$friends_profile['style'].' alt="'.$name.'"  title="'.$name.'" /></a>';
 	} else {
 		return $link.'<img src="'.api_get_path(WEB_CODE_PATH)."img/unknown.jpg".'" alt="'.$name.'"  title="'.$name.'"  /></a>';
diff --git a/main/inc/ajax/social.ajax.php b/main/inc/ajax/social.ajax.php
index cf8f9414d6..b683e58dcf 100644
--- a/main/inc/ajax/social.ajax.php
+++ b/main/inc/ajax/social.ajax.php
@@ -138,7 +138,7 @@ switch ($action) {
 		}
 		echo $friend_html;	
 		break;
-		case 'delete_friend':
+	case 'delete_friend':
 	
 		if (api_is_anonymous()){
 			echo '';
@@ -162,86 +162,86 @@ switch ($action) {
 		}*/		
 		break;
 		
-		case 'toogle_course':
-		
-			require_once api_get_path(LIBRARY_PATH).'blog.lib.php';
-			require_once api_get_path(SYS_CODE_PATH).'forum/forumfunction.inc.php';
-			require_once api_get_path(LIBRARY_PATH).'course.lib.php';
-			
-			$user_id = intval($_SESSION['social_user_id']);
-			if ($_POST['action']) {$action = $_POST['action'];}
-			
-			switch($action) {
-				
-				case 'load_course' :
-					$course_db =  $_POST['course_code'];
-					// @todo goto the course link
-					//echo '<a href="'.api_get_path(WEB_COURSE_PATH).$course_directory.'/?id_session='.$my_course['id_session'].'">'.get_lang('GotoCourse').'</a>';
-					$course_id=CourseManager::get_course_id_by_database_name($course_db);
-		
-					if (api_is_user_of_course($course_id,api_get_user_id())) {
-		
-						$table_forums 			= Database :: get_course_table(TABLE_FORUM,$course_db);
-						$table_threads 			= Database :: get_course_table(TABLE_FORUM_THREAD,$course_db);
-						$table_posts 			= Database :: get_course_table(TABLE_FORUM_POST,$course_db);
-						$table_item_property 	= Database :: get_course_table(TABLE_ITEM_PROPERTY,$course_db);
-						$table_users 			= Database :: get_main_table(TABLE_MAIN_USER);
+	case 'toogle_course':
 		
-						//------Forum messages
+		require_once api_get_path(LIBRARY_PATH).'blog.lib.php';
+		require_once api_get_path(SYS_CODE_PATH).'forum/forumfunction.inc.php';
+		require_once api_get_path(LIBRARY_PATH).'course.lib.php';
 		
-						$forum_result = get_all_post_from_user($user_id, $course_db);
-						$all_result_data = 0;
-						if ($forum_result !='') {
-							api_display_tool_title(get_lang('Forum'));
-							echo '<div class="social-background-content" style="background:#FAF9F6; padding:0px;" >';
-							echo api_xml_http_response_encode($forum_result);
-							echo '</div>';
-							echo '<br />';
-							$all_result_data++;
-						}
+		$user_id = intval($_SESSION['social_user_id']);
+		if ($_POST['action']) {$action = $_POST['action'];}
 		
-						//------Blog posts
-						$result = get_blog_post_from_user($course_db, $user_id);
-						if (!empty($result)) {
-							api_display_tool_title(api_xml_http_response_encode(get_lang('Blog')));
-							echo '<div class="social-background-content" style="background:#FAF9F6; padding:0px;">';
-							echo api_xml_http_response_encode($result);
-							echo '</div>';
-							echo '<br />';
-							$all_result_data++;
-						}
-		
-						//------Blog comments
-						$result = get_blog_comment_from_user($course_db, $user_id);
-						if (!empty($result)) {
-							echo '<div class="social-background-content" style="background:#FAF9F6; padding-left:10px;">';
-							api_display_tool_title(api_xml_http_response_encode(get_lang('BlogComments')));
-							echo api_xml_http_response_encode($result);
-							echo '</div>';
-							echo '<br />';
-							$all_result_data++;
-						}
-						if ($all_result_data == 0) {
-							echo api_xml_http_response_encode(get_lang('NoDataAvailable'));
-						}
-		
-					} else {
-							echo '<div class="clear"></div><br />';
-							api_display_tool_title(api_xml_http_response_encode(get_lang('Details')));
-							echo '<div class="social-background-content" style="background:#FAF9F6; padding:0px;">';
-							echo api_xml_http_response_encode(get_lang('UserNonRegisteredAtTheCourse'));
-							echo '<div class="clear"></div><br />';
-							echo '</div>';
-							echo '<div class="clear"></div><br />';
+		switch($action) {
+			
+			case 'load_course' :
+				$course_db =  $_POST['course_code'];
+				// @todo goto the course link
+				//echo '<a href="'.api_get_path(WEB_COURSE_PATH).$course_directory.'/?id_session='.$my_course['id_session'].'">'.get_lang('GotoCourse').'</a>';
+				$course_id=CourseManager::get_course_id_by_database_name($course_db);
+	
+				if (api_is_user_of_course($course_id,api_get_user_id())) {
+	
+					$table_forums 			= Database :: get_course_table(TABLE_FORUM,$course_db);
+					$table_threads 			= Database :: get_course_table(TABLE_FORUM_THREAD,$course_db);
+					$table_posts 			= Database :: get_course_table(TABLE_FORUM_POST,$course_db);
+					$table_item_property 	= Database :: get_course_table(TABLE_ITEM_PROPERTY,$course_db);
+					$table_users 			= Database :: get_main_table(TABLE_MAIN_USER);
+	
+					//------Forum messages
+	
+					$forum_result = get_all_post_from_user($user_id, $course_db);
+					$all_result_data = 0;
+					if ($forum_result !='') {
+						api_display_tool_title(get_lang('Forum'));
+						echo '<div class="social-background-content" style="background:#FAF9F6; padding:0px;" >';
+						echo api_xml_http_response_encode($forum_result);
+						echo '</div>';
+						echo '<br />';
+						$all_result_data++;
 					}
-					break;
-				case 'unload_course' :
-					//echo 'load2';
-					break;
-				default:
-					break;
-			}		
-			break;
+	
+					//------Blog posts
+					$result = get_blog_post_from_user($course_db, $user_id);
+					if (!empty($result)) {
+						api_display_tool_title(api_xml_http_response_encode(get_lang('Blog')));
+						echo '<div class="social-background-content" style="background:#FAF9F6; padding:0px;">';
+						echo api_xml_http_response_encode($result);
+						echo '</div>';
+						echo '<br />';
+						$all_result_data++;
+					}
+	
+					//------Blog comments
+					$result = get_blog_comment_from_user($course_db, $user_id);
+					if (!empty($result)) {
+						echo '<div class="social-background-content" style="background:#FAF9F6; padding-left:10px;">';
+						api_display_tool_title(api_xml_http_response_encode(get_lang('BlogComments')));
+						echo api_xml_http_response_encode($result);
+						echo '</div>';
+						echo '<br />';
+						$all_result_data++;
+					}
+					if ($all_result_data == 0) {
+						echo api_xml_http_response_encode(get_lang('NoDataAvailable'));
+					}
+	
+				} else {
+						echo '<div class="clear"></div><br />';
+						api_display_tool_title(api_xml_http_response_encode(get_lang('Details')));
+						echo '<div class="social-background-content" style="background:#FAF9F6; padding:0px;">';
+						echo api_xml_http_response_encode(get_lang('UserNonRegisteredAtTheCourse'));
+						echo '<div class="clear"></div><br />';
+						echo '</div>';
+						echo '<div class="clear"></div><br />';
+				}
+				break;
+			case 'unload_course' :
+				//echo 'load2';
+				break;
+			default:
+				break;
+		}		
+		break;
 	default:
 		echo '';	
 }
diff --git a/main/inc/lib/group_portal_manager.lib.php b/main/inc/lib/group_portal_manager.lib.php
index e6aef0562f..3ba5685a6e 100755
--- a/main/inc/lib/group_portal_manager.lib.php
+++ b/main/inc/lib/group_portal_manager.lib.php
@@ -288,7 +288,7 @@ class GroupPortalManager
 	/**
 	 * Gets the group's members
 	 */
-	public static function get_users_by_group($group_id, $with_image = false, $relation_type = array(), $from = 0, $limit = 15, $image_conf = array('size'=>'medium_','height'=>80))
+	public static function get_users_by_group($group_id, $with_image = false, $relation_type = array(), $from = 0, $limit = 15, $image_conf = array('size'=>USER_IMAGE_SIZE_MEDIUM,'height'=>80))
 	{
 		$where = '';
 		$table_group_rel_user	= Database::get_main_table(TABLE_MAIN_USER_REL_GROUP);
@@ -328,7 +328,7 @@ class GroupPortalManager
 		$array = array();
 		while ($row = Database::fetch_array($result, 'ASSOC')) {
 			$image_path = UserManager::get_user_picture_path_by_id($row['user_id'], 'web', false, true);
-			$user_profile = UserManager::get_picture_user($row['user_id'], $image_path['file'], 60, 'medium_');
+			$user_profile = UserManager::get_picture_user($row['user_id'], $image_path['file'], 60, USER_IMAGE_SIZE_MEDIUM);
 			if ($with_image == true) {
 				$picture = UserManager::get_picture_user($row['user_id'], $row['picture_uri'],$image_conf['height'],$image_conf['size']);						
 				$row['image'] = '<img src="'.$user_profile['file'].'"  '.$picture['style'].'  />';
diff --git a/main/inc/lib/message.lib.php b/main/inc/lib/message.lib.php
index d9eb141376..3c3b0047a5 100755
--- a/main/inc/lib/message.lib.php
+++ b/main/inc/lib/message.lib.php
@@ -22,9 +22,9 @@ require_once api_get_path(LIBRARY_PATH).'group_portal_manager.lib.php';
  */
 define('MESSAGE_STATUS_NEW',				'0');
 define('MESSAGE_STATUS_UNREAD',				'1');
+//2 ??
 define('MESSAGE_STATUS_DELETED',			'3');
 define('MESSAGE_STATUS_OUTBOX',				'4');
-
 define('MESSAGE_STATUS_INVITATION_PENDING',	'5');
 define('MESSAGE_STATUS_INVITATION_ACCEPTED','6');
 define('MESSAGE_STATUS_INVITATION_DENIED',	'7');
@@ -85,7 +85,7 @@ class MessageManager
 			return false;
 		}
 		$i=0;
-		$query = "SELECT * FROM $table_message WHERE user_receiver_id=".api_get_user_id()." AND msg_status=1";
+		$query = "SELECT * FROM $table_message WHERE user_receiver_id=".api_get_user_id()." AND msg_status=".MESSAGE_STATUS_UNREAD;
 		$result = Database::query($query,__FILE__,__LINE__);
 		$i = Database::num_rows($result);
 		return $i;
@@ -314,6 +314,7 @@ class MessageManager
 	public static function delete_message_by_user_receiver ($user_receiver_id,$id) {
 		$table_message = Database::get_main_table(TABLE_MESSAGE);
 		if ($id != strval(intval($id))) return false;
+		$user_receiver_id = intval($user_receiver_id);
 		$id = Database::escape_string($id);
 		$sql="SELECT * FROM $table_message WHERE id=".$id." AND msg_status<>4;";
 		$rs=Database::query($sql,__FILE__,__LINE__);
@@ -323,7 +324,7 @@ class MessageManager
 			// delete attachment file
 			$res = self::delete_message_attachment_file($id,$user_receiver_id);
 			// delete message
-			$query = "UPDATE $table_message SET msg_status=3 WHERE user_receiver_id=".Database::escape_string($user_receiver_id)." AND id=".$id;
+			$query = "UPDATE $table_message SET msg_status=3 WHERE user_receiver_id=".$user_receiver_id." AND id=".$id;
 			//$query = "DELETE FROM $table_message WHERE user_receiver_id=".Database::escape_string($user_receiver_id)." AND id=".$id;
 			$result = Database::query($query,__FILE__,__LINE__);			
 			return $result;
@@ -362,7 +363,7 @@ class MessageManager
 	}
 	
 	/**
-	 * save message attachment files 
+	 * Saves a message attachment files 
 	 * @param  array 	$_FILES['name']
 	 * @param  string  	a comment about the uploaded file
 	 * @param  int		message id
@@ -496,7 +497,7 @@ class MessageManager
 	 	$table_message = Database::get_main_table(TABLE_MESSAGE);
 	 	$current_uid = api_get_user_id();
 	 	$group_id = intval($group_id);	 			
-		$query = "SELECT * FROM $table_message WHERE group_id='$group_id' AND msg_status <> 4 ORDER BY id";		
+		$query = "SELECT * FROM $table_message WHERE group_id=$group_id AND msg_status <> ".MESSAGE_STATUS_OUTBOX." ORDER BY id";		
 		$rs = Database::query($query,__FILE__,__LINE__);		
 		$data = array();
 		if (Database::num_rows($rs) > 0) {
@@ -533,7 +534,7 @@ class MessageManager
 	 		$condition_limit = " LIMIT $offset,$limit ";	
 	 	}
 	 	
-		$query = "SELECT * FROM $table_message WHERE parent_id='$parent_id' AND msg_status <> 4 $condition_group_id ORDER BY send_date DESC $condition_limit ";
+		$query = "SELECT * FROM $table_message WHERE parent_id='$parent_id' AND msg_status <> ".MESSAGE_STATUS_OUTBOX." $condition_group_id ORDER BY send_date DESC $condition_limit ";
 		$rs = Database::query($query,__FILE__,__LINE__);		
 		$data = array();
 		if (Database::num_rows($rs) > 0) {
@@ -582,7 +583,7 @@ class MessageManager
 		$table_message = Database::get_main_table(TABLE_MESSAGE);
 		$request=api_is_xml_http_request();
 		$sql_query = "SELECT id as col0, user_sender_id as col1, title as col2, send_date as col3, user_receiver_id as col4, msg_status as col5 FROM $table_message " .
-					 "WHERE user_sender_id=".api_get_user_id()." AND msg_status=4 " .
+					 "WHERE user_sender_id=".api_get_user_id()." AND msg_status=".MESSAGE_STATUS_OUTBOX." " .
 					 "ORDER BY col$column $direction LIMIT $from,$number_of_items";
 
 		$sql_result = Database::query($sql_query,__FILE__,__LINE__);
@@ -632,7 +633,7 @@ class MessageManager
 	 */
 	 public static function get_number_of_messages_sent () {
 		$table_message = Database::get_main_table(TABLE_MESSAGE);
-		$sql_query = "SELECT COUNT(*) as number_messages FROM $table_message WHERE msg_status=4 AND user_sender_id=".api_get_user_id();
+		$sql_query = "SELECT COUNT(*) as number_messages FROM $table_message WHERE msg_status=".MESSAGE_STATUS_OUTBOX." AND user_sender_id=".api_get_user_id();
 		$sql_result = Database::query($sql_query,__FILE__,__LINE__);
 		$result = Database::fetch_array($sql_result);
 		return $result['number_messages'];
diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php
index af393c4356..e4aa8cc7f5 100755
--- a/main/inc/lib/social.lib.php
+++ b/main/inc/lib/social.lib.php
@@ -750,7 +750,7 @@ class SocialManager extends UserManager {
 				}
 				$image_array = UserManager::get_user_picture_path_by_id($uid, 'system', false, true);
 	
-				$friends_profile = SocialManager::get_picture_user($uid, $image_array['file'], 92, 'medium_', ' width="90" height="90" ');
+				$friends_profile = SocialManager::get_picture_user($uid, $image_array['file'], 92, USER_IMAGE_SIZE_MEDIUM , ' width="90" height="90" ');
 				// reduce image
 				$name = api_get_person_name($user_info['firstName'], $user_info['lastName']);
 				$table_row[] = '<a href="'.$url.'"><img title = "'.$name.'" alt="'.$name.'" src="'.$friends_profile['file'].'" '.$friends_profile['style'].' border="1"></a>';
diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php
index e86c95cc07..b4bcaff954 100644
--- a/main/inc/lib/usermanager.lib.php
+++ b/main/inc/lib/usermanager.lib.php
@@ -22,6 +22,14 @@ define('USER_FIELD_TYPE_DOUBLE_SELECT', 8);
 define('USER_FIELD_TYPE_DIVIDER', 9);
 define('USER_FIELD_TYPE_TAG', 10); 
 
+//User image sizes
+
+define('USER_IMAGE_SIZE_ORIGINAL',	1);
+define('USER_IMAGE_SIZE_BIG', 		2);
+define('USER_IMAGE_SIZE_MEDIUM', 	3);
+define('USER_IMAGE_SIZE_SMALL', 	4);
+
+
 class UserManager 
 {
 	private function __construct () {
@@ -2191,7 +2199,7 @@ class UserManager
      * @param string style css
      * @return array with the file and the style of an image i.e $array['file'] $array['style']
      */
-   public static function get_picture_user($user_id, $picture_file, $height, $size_picture = 'medium_', $style = '') {
+   public static function get_picture_user($user_id, $picture_file, $height, $size_picture = USER_IMAGE_SIZE_MEDIUM , $style = '') {
    	
     	$patch_profile = 'upload/users/';
     	$picture = array();
@@ -2200,6 +2208,24 @@ class UserManager
     		$picture['file'] = api_get_path(WEB_CODE_PATH).'img/'.$picture_file;
     		return $picture;
     	}
+    	
+    	switch ($size_picture) {
+    		case USER_IMAGE_SIZE_ORIGINAL :
+    			$size_picture = '';
+    		break;
+    		case USER_IMAGE_SIZE_BIG :
+    			$size_picture = 'big_';
+    		break;
+    		case USER_IMAGE_SIZE_MEDIUM :
+    			$size_picture = 'medium_';
+    		break;
+    		case USER_IMAGE_SIZE_SMALL :
+    			$size_picture = 'small_';
+    		break;    		
+    		default:
+    			$size_picture = 'medium_';
+    	}
+
         $image_array_sys = self::get_user_picture_path_by_id($user_id, 'system', false, true);
         $image_array = self::get_user_picture_path_by_id($user_id, 'web', false, true);
         $file = $image_array_sys['dir'].$size_picture.$picture_file;
diff --git a/main/social/home.php b/main/social/home.php
index ecbd893524..060dd32d49 100755
--- a/main/social/home.php
+++ b/main/social/home.php
@@ -25,8 +25,8 @@ $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jqu
 if (api_get_setting('profile', 'picture') == 'true') {
 	require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
 	$form = new FormValidator('profile', 'post', 'home.php', null, array());
-	//	PICTURE
 	
+	//	PICTURE	
 	$form->addElement('file', 'picture', get_lang('AddImage'));
 	$form->add_progress_bar();
 	if (!empty($user_data['picture_uri'])) {
@@ -36,10 +36,8 @@ if (api_get_setting('profile', 'picture') == 'true') {
 	$form->addRule('picture', get_lang('OnlyImagesAllowed').' ('.implode(',', $allowed_picture_types).')', 'filetype', $allowed_picture_types);
 	$form->addElement('style_submit_button', 'apply_change', get_lang('SaveSettings'), 'class="save"');
 						
-
 	if ($form->validate()) {
 		$user_data = $form->getSubmitValues();
-		var_dump($_FILES);
 		// upload picture if a new one is provided
 		if ($_FILES['picture']['size']) {			
 			if ($new_picture = UserManager::update_user_picture(api_get_user_id(), $_FILES['picture']['name'], $_FILES['picture']['tmp_name'])) {
@@ -53,64 +51,34 @@ if (api_get_setting('profile', 'picture') == 'true') {
 
 Display :: display_header(null);
 
+$user_info = api_get_user_info(api_get_user_id());
+
 echo '<div id="social_wrapper">';
 
 	//this include the social menu div
-	SocialManager::show_social_menu(array('messages'));	
+	SocialManager::show_social_menu();	
 	
 	echo '<div id="social_main">';
 	
 		echo '<div id="social_main_sub">';
 		
 			echo '<div id="social_top">';
-			echo get_lang('User Online').'120';
+			echo get_lang('FriendsOnline').'120';
 			echo '</div>';
 		
 			echo '<div id="social_left">';
 
-				//@todo fix this aswell as in main/auth/profile.php
-				//User picture size is calculated from SYSTEM path
-				$image_syspath = UserManager::get_user_picture_path_by_id(api_get_user_id(), 'system', false, true);
-				$image_syspath['dir'].$image_syspath['file'];
-				
-				$image_size = @getimagesize($image_syspath['dir'].$image_syspath['file']);
-				
-				//Web path
-				$image_path = UserManager::get_user_picture_path_by_id(api_get_user_id(), 'web', false, true);
-				$image_dir = $image_path['dir'];
-				$image = $image_path['file'];
-				$image_file = $image_dir.$image;
-				$img_attributes = 'src="'.$image_file.'?rand='.time().'" '
-					.'alt="'.api_get_person_name($user_data['firstname'], $user_data['lastname']).'" '
-					.'style="float:'.($text_dir == 'rtl' ? 'left' : 'right').'; margin-top:0px;padding:5px;" ';
-				if ($image_size[0] > 300) {
-					//limit display width to 300px
-					$img_attributes .= 'width="300" ';
-				}
+				//@todo fix this code aswell as in main/auth/profile.php				
 				
-				// get the path,width and height from original picture
-				$big_image = $image_dir.'big_'.$image;
+				$user_image_array = UserManager::get_picture_user(api_get_user_id(), $user_info['picture_uri'], 200, USER_IMAGE_SIZE_MEDIUM);
 				
-				$big_image_size = api_getimagesize($big_image);
-				$big_image_width = $big_image_size[0];
-				$big_image_height = $big_image_size[1];
-				$url_big_image = $big_image.'?rnd='.time();
 				
-				// Style position:absolute has been removed for Opera-compatibility. 
-				//echo '<div id="image-message-container" style="float:right;display:inline;position:absolute;padding:3px;width:250px;" >';
-				//echo '<div id="image-message-container" style="float:right;display:inline;padding:3px;width:250px;" >';
-				
-				if ($image == 'unknown.jpg') {
-					echo '<img '.$img_attributes.' />';
-					if (api_get_setting('profile', 'picture') == 'true') {				
-						$form->display();
-					}
+				if ($user_image_array['file'] != 'unknown.jpg') {
+	    	  		echo '<img src='.$user_image_array['dir'].$user_image_array['file'].' /> <br /><br />';
 				} else {
-					echo '<input type="image" '.$img_attributes.' onclick="javascript: return show_image(\''.$url_big_image.'\',\''.$big_image_width.'\',\''.$big_image_height.'\');"/>';
+					echo '<img src='.$user_image_array['dir'].$user_image_array['file'].' /><br /><br />';
 				}
 
-
-
 			
 				echo '<div id="social_center">';
 				echo '</div>';	
diff --git a/main/social/profile.php b/main/social/profile.php
index 74b97fd25c..abe60cd473 100755
--- a/main/social/profile.php
+++ b/main/social/profile.php
@@ -213,7 +213,8 @@ Display :: display_header(null);
 //User picture size is calculated from SYSTEM path
 
 $img_array= UserManager::get_user_picture_path_by_id($user_id,'web',true,true);
-$big_image =  UserManager::get_picture_user($user_id, $img_array['file'],'','big_');
+$big_image =  UserManager::get_picture_user($user_id, $img_array['file'],'',USER_IMAGE_SIZE_BIG);
+ 
 $big_image = $big_image['file'].$big_image['dir'];
 //print_r($user_info);
 // Added by Ivan Tcholakov, 03-APR-2009.
@@ -302,7 +303,7 @@ echo '<div id="social-profile-wrapper">';
 							$name_user	= api_get_person_name($friend['firstName'], $friend['lastName']);
 							$friend_html.='<div id=div_'.$friend['friend_user_id'].' class="image_friend_network" ><span><center>';
 							// the height = 92 must be the sqme in the image_friend_network span style in default.css
-							$friends_profile = SocialManager::get_picture_user($friend['friend_user_id'], $friend['image'], 92, 'medium_', 'width="85" height="90" ');
+							$friends_profile = SocialManager::get_picture_user($friend['friend_user_id'], $friend['image'], 92, USER_IMAGE_SIZE_MEDIUM , 'width="85" height="90" ');
 							
 							$friend_html.='<a href="profile.php?u='.$friend['friend_user_id'].'&amp;'.$link_shared.'">';
 							$friend_html.='<img src="'.$friends_profile['file'].'" '.$friends_profile['style'].' id="imgfriend_'.$friend['friend_user_id'].'" title="'.$name_user.'" />';
diff --git a/main/user/user.php b/main/user/user.php
index 1c806dddf1..94198855e0 100755
--- a/main/user/user.php
+++ b/main/user/user.php
@@ -451,7 +451,7 @@ function get_user_data($from, $number_of_items, $column, $direction) {
 
 				$temp[] = $user_id;
 				$image_path = UserManager::get_user_picture_path_by_id($user_id, 'web', false, true);
-				$user_profile = UserManager::get_picture_user($user_id, $image_path['file'], 22, 'small_', ' width="22" height="22" ');
+				$user_profile = UserManager::get_picture_user($user_id, $image_path['file'], 22, USER_IMAGE_SIZE_SMALL, ' width="22" height="22" ');
 				if (!api_is_anonymous()) {
 					$photo = '<center><a href="userInfo.php?'.api_get_cidreq().'&origin='.$origin.'&amp;uInfo='.$user_id.'" title="'.get_lang('Info').'"  ><img src="'.$user_profile['file'].'" '.$user_profile['style'].' alt="'.api_get_person_name($o_course_user['firstname'], $o_course_user['lastname']).'"  title="'.api_get_person_name($o_course_user['firstname'], $o_course_user['lastname']).'" /></a></center>';
 				} else {
diff --git a/user_portal.php b/user_portal.php
index 00cb9a97c6..736719ac6e 100644
--- a/user_portal.php
+++ b/user_portal.php
@@ -1222,7 +1222,7 @@ if ($show_menu) {
 		if ($img_array['file'] == 'unknown.jpg') {
 			$no_image =true;
 		}		
-		$img_array = UserManager::get_picture_user(api_get_user_id(), $img_array['file'], 92, 'medium_', ' width="90" height="90" ');
+		$img_array = UserManager::get_picture_user(api_get_user_id(), $img_array['file'], 92, USER_IMAGE_SIZE_MEDIUM, ' width="90" height="90" ');
 		
 		echo '<div id="social_widget" style="">';
 		if ($no_image == false)