diff --git a/app/src/main/java/com/chwl/app/avroom/public_chat/PublicChatMessageView.java b/app/src/main/java/com/chwl/app/avroom/public_chat/PublicChatMessageView.java
index 8a5599ba1..2004d2de0 100644
--- a/app/src/main/java/com/chwl/app/avroom/public_chat/PublicChatMessageView.java
+++ b/app/src/main/java/com/chwl/app/avroom/public_chat/PublicChatMessageView.java
@@ -597,10 +597,14 @@ public class PublicChatMessageView extends FrameLayout {
          * @param tvContent       -
          */
         private void setMsgText(ChatRoomMessage chatRoomMessage, TextView tvContent) {
-            ChatRoomMessageExtension extension = chatRoomMessage.getChatRoomMessageExtension();
             TextSpannableBuilder text = new TextSpannableBuilder(tvContent);
             addCommonTag(chatRoomMessage, text, tvContent);
-            String nickName = extension == null ? ResUtil.getString(R.string.avroom_widget_messageview_0116) : RegexUtil.getPrintableString(extension.getSenderNick());
+            String nickName;
+            if (chatRoomMessage.getFromAccount() != null && chatRoomMessage.getFromAccount().equals(AuthModel.get().getCurrentUid() + "")) {
+                nickName = ResUtil.getString(R.string.avroom_widget_messageview_0116);
+            } else {
+                nickName = NobleUtil.getNamePlate(UserInfo.NICK, chatRoomMessage);
+            }
             text.append(nickName, new ForegroundColorSpan(greyColor));
             text.append(": " + chatRoomMessage.getContent(), new ForegroundColorSpan(getResources().getColor(R.color.white)));
             List<String> atUids = ExtensionUtil.getListExtension(chatRoomMessage, UserInfo.AT_UIDS);