Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java
===================================================================
diff -u -re7bec9aefa810fa77d2601c071f0f99ab3ec7c86 -rf3b9fb85e85dae50e18544e46f7be746ee182429
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java	(.../ChatService.java)	(revision e7bec9aefa810fa77d2601c071f0f99ab3ec7c86)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java	(.../ChatService.java)	(revision f3b9fb85e85dae50e18544e46f7be746ee182429)
@@ -647,7 +647,8 @@
 
 				messageElement.appendChild(bodyElement);
 				messageElement.appendChild(xElement);
-
+				filterMessage(messageElement, chatUser.getChatSession().getChat());
+								
 				xmlMessageList.add(messageElement);
 				//printXMLNode(messageElement, "");
 			}
@@ -677,22 +678,7 @@
 		
 	}
 
-	public void filterMessage(Node message) {
-		NamedNodeMap nnm = message.getAttributes();
-		String from = nnm.getNamedItem("from").getNodeValue();
-
-		// extracting jabber room.
-		int index = from.lastIndexOf("/");
-		String jabberRoom;
-		if (index != -1) {
-			jabberRoom = from.substring(0, index);
-		} else {
-			jabberRoom = from;
-		}
-
-		// get the chat content3
-		Chat chat = getSessionByJabberRoom(jabberRoom).getChat();
-
+	public void filterMessage(Node message, Chat chat) {
 		if (!chat.getFilteringEnabled()) {
 			return;
 		}
@@ -731,7 +717,25 @@
 		Matcher matcher = pattern.matcher(bodyText.getNodeValue());
 		bodyText.setNodeValue(matcher.replaceAll("***"));
 	}
+	
+	public void filterMessage(Node message) {
+		NamedNodeMap nnm = message.getAttributes();
+		String from = nnm.getNamedItem("from").getNodeValue();
 
+		// extracting jabber room.
+		int index = from.lastIndexOf("/");
+		String jabberRoom;
+		if (index != -1) {
+			jabberRoom = from.substring(0, index);
+		} else {
+			jabberRoom = from;
+		}
+
+		// get the chat content3
+		Chat chat = getSessionByJabberRoom(jabberRoom).getChat();
+		filterMessage(message, chat);
+	}
+
 	public ChatMessageFilter updateMessageFilters(Chat chat) {
 		ChatMessageFilter filter = new ChatMessageFilter(chat);
 		messageFilters.put(chat.getToolContentId(), filter);
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/IChatService.java
===================================================================
diff -u -r58ba169375d70067bb94de52da9dea9c851c0433 -rf3b9fb85e85dae50e18544e46f7be746ee182429
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/IChatService.java	(.../IChatService.java)	(revision 58ba169375d70067bb94de52da9dea9c851c0433)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/IChatService.java	(.../IChatService.java)	(revision f3b9fb85e85dae50e18544e46f7be746ee182429)
@@ -198,6 +198,13 @@
 	
 	/**
 	 * 
+	 * @param message
+	 * @param chat
+	 */
+	public void filterMessage(Node message, Chat chat);
+	
+	/**
+	 * 
 	 * @param messageUID
 	 * @return
 	 */