diff --git a/app/src/main/java/com/example/tampopo_client/Tampopo.java b/app/src/main/java/com/example/tampopo_client/Tampopo.java
index 5cf6ea8..1a1516a 100644
--- a/app/src/main/java/com/example/tampopo_client/Tampopo.java
+++ b/app/src/main/java/com/example/tampopo_client/Tampopo.java
@@ -13,6 +13,7 @@
   private String password;
   private String chatroomId;
   private String chatFriendId;
+  private String chatFriendNickname;
   private String mailaddress;
   private String nickname;
   private String icon;
@@ -75,6 +76,15 @@
     saveUserData();
   }
 
+  public String getChatFriendNickname() {
+    return chatFriendNickname;
+  }
+
+  public void setChatFriendNickname(String ChatFriendNickname) {
+    this.chatFriendNickname = ChatFriendNickname;
+    saveUserData();
+  }
+
 
   public String getNickname() { return nickname; }
 
@@ -99,6 +109,7 @@
     editor.putString("password", password);
     editor.putString("chatroomId", chatroomId);
     editor.putString("chatFriendId", chatFriendId);
+    editor.putString("chatFriendNickname", chatFriendNickname);
     editor.putString("mailaddress", mailaddress);
     editor.putString("nickname", nickname);
     editor.putString("icon", icon);
@@ -113,6 +124,7 @@
     password = prefs.getString("password", "");
     chatroomId = prefs.getString("chatroomId", "");
     chatFriendId = prefs.getString("chatFriendId", "");
+    chatFriendNickname = prefs.getString("chatFriendNickname", "");
     mailaddress = prefs.getString("mailaddress", "");
     nickname = prefs.getString("nickname", "");
     icon = prefs.getString("icon", "");
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..5dc5626 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
@@ -53,8 +53,8 @@
     sendButton = findViewById(R.id.send_Button);
     backButton = findViewById(R.id.back_Button);
     roomId = findViewById(R.id.chat_room_id);
-    TextView friendIdTextView = findViewById(R.id.friend_id);
-    friendIdTextView.setText(tampopo.getChatFriendId());
+    TextView friendNicknameTextView = findViewById(R.id.friend_nickname);
+    friendNicknameTextView.setText(tampopo.getChatFriendNickname());
     receiverMessage.setKeyListener(null);//受信メッセージ編集不可
 
 //    buttonSend.setOnClickListener(new OnClickListener() {
diff --git a/app/src/main/java/com/example/tampopo_client/views/FriendIconView.java b/app/src/main/java/com/example/tampopo_client/views/FriendIconView.java
index da95864..a87db6c 100644
--- a/app/src/main/java/com/example/tampopo_client/views/FriendIconView.java
+++ b/app/src/main/java/com/example/tampopo_client/views/FriendIconView.java
@@ -156,6 +156,7 @@
             Tampopo tampopo = (Tampopo) ((MainActivity) getContext()).getApplication();
 //            String chatroomId = chatViewModel.enterChatroom(tampopo.getUserId(), friendUserId, tampopo.getToken());
             tampopo.setChatFriendId(friendUserId);
+            tampopo.setChatFriendNickname(fromUserNickname);
 
             // ChatActivityに画面遷移する
             Context ctx = getContext();
@@ -195,6 +196,7 @@
                     String chatroomId = chatViewModel.enterChatroom(tampopo.getUserId(), friendUserId, tampopo.getToken());
                     tampopo.setChatroomId(chatroomId);
                     tampopo.setChatFriendId(friendUserId);
+                    tampopo.setChatFriendNickname(toUserNickname);
                     Handler handler = new Handler(Looper.getMainLooper());
                     handler.post(new Runnable() {
                         @Override
diff --git a/app/src/main/res/layout/activity_chat.xml b/app/src/main/res/layout/activity_chat.xml
index 8d68cf3..5625eb2 100644
--- a/app/src/main/res/layout/activity_chat.xml
+++ b/app/src/main/res/layout/activity_chat.xml
@@ -79,10 +79,11 @@
       app:layout_constraintVertical_bias="0.04" />
 
   <TextView
-    android:id="@+id/friend_id"
+    android:id="@+id/friend_nickname"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:text="friendid"
+    android:text=""
+    android:textSize="18sp"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintHorizontal_bias="0.87"