diff --git a/app/src/main/java/com/example/tampopo_client/models/Chatroom.java b/app/src/main/java/com/example/tampopo_client/models/Chatroom.java
index 4fe8b21..fdea4da 100644
--- a/app/src/main/java/com/example/tampopo_client/models/Chatroom.java
+++ b/app/src/main/java/com/example/tampopo_client/models/Chatroom.java
@@ -8,10 +8,12 @@
     private String chatRoomId;
     private String user0Id;
     private String user1Id;
-    private String newContent;
-    private String chatRoomNumber; // サーバーにも存在するので保持
+//    private String newContent;
+//    private String chatRoomNumber; // サーバーにも存在するので保持
+    private List<Message> message = new ArrayList<>();
     private List<Message> messages = new ArrayList<>();
     private List<String> users = new ArrayList<>();
+    private boolean empty;
 
     // --- コンストラクタ ---
     public Chatroom() {
@@ -50,20 +52,28 @@
         this.user1Id = user1Id;
     }
 
-    public String getNewContent() {
-        return newContent;
+//    public String getNewContent() {
+//        return newContent;
+//    }
+//
+//    public void setNewContent(String newContent) {
+//        this.newContent = newContent;
+//    }
+//
+//    public String getChatRoomNumber() {
+//        return chatRoomNumber;
+//    }
+//
+//    public void setChatRoomNumber(String chatRoomNumber) {
+//        this.chatRoomNumber = chatRoomNumber;
+//    }
+
+    public List<Message> getMessage() {
+        return message;
     }
 
-    public void setNewContent(String newContent) {
-        this.newContent = newContent;
-    }
-
-    public String getChatRoomNumber() {
-        return chatRoomNumber;
-    }
-
-    public void setChatRoomNumber(String chatRoomNumber) {
-        this.chatRoomNumber = chatRoomNumber;
+    public void setMessage(List<Message> message) {
+        this.message = message;
     }
 
     public List<Message> getMessages() {
@@ -84,7 +94,7 @@
 
     // --- メッセージ追加 ---
     public void addMessage(String senderId, String content) {
-        messages.add(new Message(senderId, content));
+        message.add(new Message(senderId, content));
     }
 
     // --- ユーザー操作 ---
@@ -99,7 +109,11 @@
     }
 
     public boolean isEmpty() {
-        return users.isEmpty();
+        return empty;
+    }
+
+    public void setEmpty(boolean empty) {
+        this.empty = empty;
     }
 
     // --- 内部クラス Message ---