diff --git a/main/inc/lib/chat.lib.php b/main/inc/lib/chat.lib.php
index 6d2d220328..bf57d0b7c1 100755
--- a/main/inc/lib/chat.lib.php
+++ b/main/inc/lib/chat.lib.php
@@ -104,11 +104,13 @@ class Chat extends Model
                 $items[$from_user_id]['items'][] = $item;
                 $items[$from_user_id]['user_info']['user_name'] = $user_info['complete_name'];
                 $items[$from_user_id]['user_info']['online'] = $user_info['user_is_online'];
+                $items[$from_user_id]['user_info']['avatar'] = $user_info['avatar_small'];
                 $_SESSION['openChatBoxes'][$from_user_id] = api_strtotime($chat['sent'], 'UTC');
             }
             $_SESSION['chatHistory'][$from_user_id]['items'][] = $item;
             $_SESSION['chatHistory'][$from_user_id]['user_info']['user_name'] = $user_info['complete_name'];
             $_SESSION['chatHistory'][$from_user_id]['user_info']['online'] = $user_info['user_is_online'];
+            $_SESSION['chatHistory'][$from_user_id]['user_info']['avatar'] = $user_info['avatar_small'];
         }
 
         if (!empty($_SESSION['openChatBoxes'])) {
diff --git a/main/inc/lib/javascript/chat/js/chat.js b/main/inc/lib/javascript/chat/js/chat.js
index aa1769f08b..e7db0f6ba5 100755
--- a/main/inc/lib/javascript/chat/js/chat.js
+++ b/main/inc/lib/javascript/chat/js/chat.js
@@ -143,7 +143,7 @@ function startChatSession() {
                         if (item)    { // fix strange ie bug
                             //my_user_id        = item.f;
                             if ($("#chatbox_"+my_user_id).length <= 0) {
-                                createChatBox(my_user_id, user_items.user_info.user_name, 1, user_items.user_info.online);
+                                createChatBox(my_user_id, user_items.user_info.user_name, 1, user_items.user_info.online, user_items.user_info.avatar);
                             }
 
                             if (item.s == 1) {
@@ -242,7 +242,7 @@ function chatHeartbeat() {
 					if (item)	{ // fix strange ie bug
 
 						if ($("#chatbox_"+my_user_id).length <= 0) {
-							createChatBox(my_user_id, user_items.user_info.user_name, 0, user_items.user_info.online);
+							createChatBox(my_user_id, user_items.user_info.user_name, 0, user_items.user_info.online, user_items.user_info.avatar);
 						}
 						if ($("#chatbox_"+my_user_id).css('display') == 'none') {
 							$("#chatbox_"+my_user_id).css('display','block');