diff --git a/app/DataBase/output.py b/app/DataBase/output.py
index 763ff0f..c4941b7 100644
--- a/app/DataBase/output.py
+++ b/app/DataBase/output.py
@@ -124,12 +124,12 @@ class ExporterBase(QThread):
     def get_avatar_path(self, is_send, message, is_absolute_path=False) -> str:
         if is_absolute_path:
             if self.contact.is_chatroom:
-                avatar = message[13].avatar_path
+                avatar = message[-1].avatar_path
             else:
                 avatar = Me().avatar_path if is_send else self.contact.avatar_path
         else:
             if self.contact.is_chatroom:
-                avatar = message[13].smallHeadImgUrl
+                avatar = message[-1].smallHeadImgUrl
             else:
                 avatar = Me().smallHeadImgUrl if is_send else self.contact.smallHeadImgUrl
         return avatar
@@ -139,7 +139,7 @@ class ExporterBase(QThread):
             if is_send:
                 display_name = Me().name
             else:
-                display_name = message[13].remark
+                display_name = message[-1].remark
         else:
             display_name = Me().name if is_send else self.contact.remark
         return escape_js_and_html(display_name)
diff --git a/app/ui/chat/chat_info.py b/app/ui/chat/chat_info.py
index f608484..696464d 100644
--- a/app/ui/chat/chat_info.py
+++ b/app/ui/chat/chat_info.py
@@ -82,17 +82,12 @@ class ChatInfo(QWidget):
             return True
         return False
 
-    def get_avatar_path(self, is_send, message, is_absolute_path=False) -> str:
+    def get_avatar(self, is_send, message) -> str:
         if self.contact.is_chatroom:
-            avatar = message[13].smallHeadImgUrl
+            # message[-1].save_avatar()
+            avatar = message[-1].avatar
         else:
-            avatar = Me().smallHeadImgUrl if is_send else self.contact.smallHeadImgUrl
-        if is_absolute_path:
-            if self.contact.is_chatroom:
-                # message[13].save_avatar()
-                avatar = message[13].avatar
-            else:
-                avatar = Me().avatar if is_send else self.contact.avatar
+            avatar = Me().avatar if is_send else self.contact.avatar
         return avatar
 
     def get_display_name(self, is_send, message) -> str:
@@ -100,7 +95,7 @@ class ChatInfo(QWidget):
             if is_send:
                 display_name = Me().name
             else:
-                display_name = message[13].remark
+                display_name = message[-1].remark
         else:
             display_name = None
         return display_name
@@ -112,7 +107,7 @@ class ChatInfo(QWidget):
             str_time = message[8]
             # print(type_, type(type_))
             is_send = message[4]
-            avatar = self.get_avatar_path(is_send, message,True)
+            avatar = self.get_avatar(is_send, message)
             display_name = self.get_display_name(is_send, message)
             timestamp = message[5]
             BytesExtra = message[10]