diff --git a/ChatServiceApp/funcs.py b/ChatServiceApp/funcs.py
index 5e7ff3f..a0b4fec 100644
--- a/ChatServiceApp/funcs.py
+++ b/ChatServiceApp/funcs.py
@@ -332,7 +332,10 @@ def get_chat_receivers_for_user(user, cur_receiver=None):
     for msg in msgs:
         if msg.receiver not in receivers_list and msg.receiver != user:
             msg.receiver.unread_msgs_count = 0
-            msg.receiver.last_msg = msg.text
+            if msg.text:
+                msg.receiver.last_msg = msg.text
+            elif msg.files:
+                msg.receiver.last_msg = msg.files[len(msg.files)-1]['file_name']
             receivers_list.append(msg.receiver)
 
 
@@ -340,7 +343,10 @@ def get_chat_receivers_for_user(user, cur_receiver=None):
         if msg.sender not in receivers_list and msg.sender != user:
             msg.sender.unread_msgs_count = 0
             receivers_list.append(msg.sender)
-            msg.sender.last_msg = msg.text
+            if msg.text:
+                msg.sender.last_msg = msg.text
+            elif msg.files:
+                msg.sender.last_msg = msg.files[len(msg.files)-1]['file_name']
 
             if msg.status == 'sended':
                 i = receivers_list.index(msg.sender)