Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatMessage.java
===================================================================
diff -u -rab5081b1158892eeae5aec995cc7dce02940e350 -r70dbabea3214c441f5a63c747dd3f0a0f311594d
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatMessage.java	(.../ChatMessage.java)	(revision ab5081b1158892eeae5aec995cc7dce02940e350)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatMessage.java	(.../ChatMessage.java)	(revision 70dbabea3214c441f5a63c747dd3f0a0f311594d)
@@ -25,6 +25,10 @@
 
 package org.lamsfoundation.lams.tool.chat.model;
 
+import java.util.Date;
+
+import org.apache.commons.lang.builder.ToStringBuilder;
+
 /**
  * Represents a jabber message sent by a user toUser a groupchat session
  * 
@@ -42,6 +46,8 @@
 	// Fields
 	private Long uid;
 
+	private ChatSession chatSession;
+
 	private ChatUser fromUser;
 
 	private ChatUser toUser;
@@ -50,19 +56,14 @@
 
 	private String body;
 
+	private Date sendDate;
+
+	private Boolean hidden;
+
 	/** default constructor */
 	public ChatMessage() {
 	}
 
-	/** full constructor */
-	public ChatMessage(Long messageId, ChatUser from, ChatUser to, String type,
-			String body) {
-		this.fromUser = from;
-		this.toUser = to;
-		this.type = type;
-		this.body = body;
-	}
-
 	// Property accessors
 
 	/**
@@ -77,6 +78,17 @@
 	}
 
 	/**
+	 * @hibernate.many-to-one column="chat_session_uid" not-null="true"
+	 */
+	public ChatSession getChatSession() {
+		return chatSession;
+	}
+
+	public void setChatSession(ChatSession chatSession) {
+		this.chatSession = chatSession;
+	}
+
+	/**
 	 * @hibernate.many-to-one not-null="true"
 	 * @hibernate.column name="from_user_id"
 	 * 
@@ -125,4 +137,32 @@
 	public void setBody(String body) {
 		this.body = body;
 	}
+
+	/**
+	 * @hibernate.property column="send_date"
+	 */
+	public Date getSendDate() {
+		return sendDate;
+	}
+
+	public void setSendDate(Date sendDate) {
+		this.sendDate = sendDate;
+	}
+
+	/**
+	 * 
+	 * @hibernate.property column="hidden"
+	 */
+	public Boolean getHidden() {
+		return hidden;
+	}
+
+	public void setHidden(Boolean hidden) {
+		this.hidden = hidden;
+	}
+
+	public String toString() {
+		return new ToStringBuilder(this).append("uid", uid)
+				.append("body", body).toString();
+	}
 }