diff --git a/app/src/main/java/com/example/tampopo_client/models/ChatMessage.java b/app/src/main/java/com/example/tampopo_client/models/ChatMessage.java
index 754a7e1..1b364e8 100644
--- a/app/src/main/java/com/example/tampopo_client/models/ChatMessage.java
+++ b/app/src/main/java/com/example/tampopo_client/models/ChatMessage.java
@@ -2,12 +2,14 @@
 
 public class ChatMessage {
     private String senderId;  // メッセージ送信者のID
+    private String senderNickname; // メッセージ送信者のニックネーム
     private String content;   // メッセージ本文
 
     public ChatMessage() {}
 
-    public ChatMessage(String senderId, String content) {
+    public ChatMessage(String senderId, String senderNickname, String content) {
         this.senderId = senderId;
+        this.senderNickname = senderNickname;
         this.content = content;
     }
 
@@ -17,6 +19,15 @@
     public void setSenderId(String senderId) {
         this.senderId = senderId;
     }
+
+    public String getSenderNickname() {
+        return senderNickname;
+    }
+
+    public void setSenderNickname(String senderNickname) {
+        this.senderNickname = senderNickname;
+    }
+
     public String getContent() {
         return content;
     }
diff --git a/app/src/main/java/com/example/tampopo_client/views/ChatActivity.java b/app/src/main/java/com/example/tampopo_client/views/ChatActivity.java
index 494c624..2f89503 100644
--- a/app/src/main/java/com/example/tampopo_client/views/ChatActivity.java
+++ b/app/src/main/java/com/example/tampopo_client/views/ChatActivity.java
@@ -31,6 +31,7 @@
   private Button sendButton;
   private ImageButton backButton;
   private TextView roomId;
+  private TextView friendNickname;
 
   Tampopo tampopo;
 
@@ -53,6 +54,7 @@
     sendButton = findViewById(R.id.send_Button);
     backButton = findViewById(R.id.back_Button);
     roomId = findViewById(R.id.chat_room_id);
+    friendNickname = findViewById(R.id.friend_nickname);
     TextView friendIdTextView = findViewById(R.id.friend_id);
     friendIdTextView.setText(tampopo.getChatFriendId());
     receiverMessage.setKeyListener(null);//受信メッセージ編集不可
@@ -73,33 +75,13 @@
 
 //    Intent intent = getIntent();
 //    String friendId = intent.getStringExtra("friendId");
-//    String chatroomId = intent.getStringExtra("chatroomId");
+//    String chatroomId = intent.getStringExtra("chatroomId
 
-
-
-    //String myId = tampopo.getUserId();
-    //String friendId = tampopo.getChatFriendId();
     String chatroomId = tampopo.getChatroomId();
     roomId.setText(chatroomId);
-    //String chatroomId = "0";
-    //String token = tampopo.getToken();
 
-    // chatroomViewModel.enterChatroom(myId, friendId, token);
-
-    //Log.d("ChatDebug", "チャット相手ID: " + friendId);
     Log.d("ChatDebug", "チャットルームID: " + chatroomId);
 
-
-//    chatroomViewModel.getChatroomIdLiveData().observe(this, id -> {
-//      if (id != null) {
-//        tampopo.setChatroomId(id);
-//        System.out.println("チャットルーム作成完了！ ID: " + id);
-//      } else {
-//        System.out.println("チャットルーム作成に失敗しました");
-//      }
-//    });
-
-
     //メッセージ送信
     sendButton.setOnClickListener(new OnClickListener() { //sendButtonがクリックされたときの処理
       @Override
@@ -126,6 +108,7 @@
 
         if (!myUserId.equals(senderId)) { //自分のIDが相手のIDと異なっていれば,(相手からのメッセージと判断)
           receiverMessage.setText(chatMessage.getContent());// 相手からのメッセージを受信欄に表示
+          friendNickname.setText(chatMessage.getSenderNickname());
         }
       }
     });
diff --git a/app/src/main/res/layout/activity_chat.xml b/app/src/main/res/layout/activity_chat.xml
index 8d68cf3..159c454 100644
--- a/app/src/main/res/layout/activity_chat.xml
+++ b/app/src/main/res/layout/activity_chat.xml
@@ -9,6 +9,17 @@
   tools:context=".views.ChatActivity"
   android:background="#E0F7FA">
 
+  <TextView
+    android:id="@+id/friend_nickname"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:text=""
+    android:textSize="18sp"
+    android:textStyle="bold"
+    app:layout_constraintTop_toTopOf="@+id/receiver_message"
+    app:layout_constraintStart_toStartOf="@+id/receiver_message"
+    android:layout_marginTop="-25dp"/>
+
 
   <EditText
     android:id="@+id/receiver_message"