diff --git a/WEB-INF/src/dao/ThreadDAO.java b/WEB-INF/src/dao/ThreadDAO.java
index 4ce3f5e67af34e47514883b95fdd2c86720f4e78..f59390f14f4aca1b1a126bd738dda6e452e2e41e 100644
--- a/WEB-INF/src/dao/ThreadDAO.java
+++ b/WEB-INF/src/dao/ThreadDAO.java
@@ -35,6 +35,27 @@ public class ThreadDAO {
         return messages;
     }
 
+    public List<Message> getAllMessagesFromThread(int threadId){
+        ArrayList<Message> messages = new ArrayList<>();
+        try{
+            PreparedStatement ps = this.con.prepareStatement("SELECT msg FROM msg WHERE thread_id=?;");
+            ps.setInt(1, threadId);
+            ResultSet rs = ps.executeQuery();
+
+            while(rs.next()){
+                int msgId = rs.getInt(1);
+                int userIdMsg = rs.getInt(2);
+                String msg = rs.getString(3);
+
+                messages.add(new Message(msgId,userIdMsg,threadId,msg));
+            }
+        } catch (SQLException sqle) {
+            sqle.getStackTrace();
+        }
+
+        return messages;
+    }
+
     // Créer un thread
     public void createThread(User user, String threadName) throws SQLException {
         PreparedStatement ps = this.con.prepareStatement("INSERT INTO thread (userID_thread, threadName) VALUES(?, ?)");