Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatSession.java
===================================================================
diff -u -rbb0125e666b0b7a7ca7fbe5f76d7ba2a4f11e639 -rb0ebbf1a5d021037d1ff2e6649970d1ea760eb39
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatSession.java	(.../ChatSession.java)	(revision bb0125e666b0b7a7ca7fbe5f76d7ba2a4f11e639)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatSession.java	(.../ChatSession.java)	(revision b0ebbf1a5d021037d1ff2e6649970d1ea760eb39)
@@ -63,6 +63,8 @@
 	private Set chatUsers = new HashSet(0);
 	
 	private String jabberRoom;
+	
+	private Set chatMessages;
 
 	// Constructors
 
@@ -178,7 +180,7 @@
 
 	/**
 	 * @hibernate.set lazy="true" inverse="true" cascade="none"
-	 * @hibernate.collection-key column="session_id"
+	 * @hibernate.collection-key column="chat_session_uid"
 	 * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.chat.model.ChatUser"
 	 * 
 	 */
@@ -201,7 +203,22 @@
 	public void setJabberRoom(String jabberRoom) {
 		this.jabberRoom = jabberRoom;
 	}
+	
+	/**
+	 * @hibernate.set lazy="true" inverse="true" cascade="none"
+	 * @hibernate.collection-key column="chat_session_uid"
+	 * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.chat.model.ChatMessage"
+	 * 
+	 */
 
+	public Set getChatMessages() {
+		return this.chatMessages;
+	}
+
+	public void setChatMessages(Set chatMessages) {
+		this.chatMessages = chatMessages;
+	}
+
 	/**
 	 * toString
 	 * 
@@ -217,7 +234,7 @@
 		buffer.append("sessionStartDate").append("='").append(
 				getSessionStartDate()).append("' ");
 		buffer.append("status").append("='").append(getStatus()).append("' ");
-		buffer.append("sessionId").append("='").append(getSessionId()).append(
+		buffer.append("sessionID").append("='").append(getSessionId()).append(
 				"' ");
 		buffer.append("sessionName").append("='").append(getSessionName())
 				.append("' ");