Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java
===================================================================
diff -u -r901372af1b71238311d32a55f25ec8ba637bf5ca -r74865706e83891b502e67d75cad229ca6d6ddcd9
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java	(.../MessageDao.java)	(revision 901372af1b71238311d32a55f25ec8ba637bf5ca)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java	(.../MessageDao.java)	(revision 74865706e83891b502e67d75cad229ca6d6ddcd9)
@@ -40,7 +40,7 @@
     private static final String SQL_QUERY_FIND_TOPICS_FROM_AUTHOR = "from " + Message.class.getName()
 	    + " where is_authored = true and forum_uid=? order by create_date";
 
-    private static final String SQL_QUERY_FIND_CHILDREN = "from " + Message.class.getName() + " where parent=?";
+    private static final String SQL_QUERY_FIND_CHILDREN = "from " + Message.class.getName() + " m where m.parent.uid=?";
 
     private static final String SQL_QUERY_BY_USER_SESSION = "from " + Message.class.getName() + " m "
 	    + " where m.createdBy.uid = ? and  m.toolSession.sessionId=?";
Index: lams_tool_forum/web/jsps/authoring/addCondition.jsp
===================================================================
diff -u -racc8d2acf5b6b0002e0c8129947040a779ab4077 -r74865706e83891b502e67d75cad229ca6d6ddcd9
--- lams_tool_forum/web/jsps/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision acc8d2acf5b6b0002e0c8129947040a779ab4077)
+++ lams_tool_forum/web/jsps/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision 74865706e83891b502e67d75cad229ca6d6ddcd9)
@@ -40,7 +40,7 @@
 		<lams:ImgButtonWrapper>
 			<a href="javascript:;" onclick="javascript:forumConditionForm.submit();" class="button-add-item"><fmt:message
 					key="label.save" /> </a>
-			<a href="javascript:;" onclick="javascript:window.top.hideConditionMessage();"
+			<a href="javascript:;" onclick="javascript:window.parent.hideConditionMessage();"
 				class="button space-left"><fmt:message key="button.cancel" /> </a>
 		</lams:ImgButtonWrapper>
 	</body>
Index: lams_tool_forum/web/jsps/authoring/conditionList.jsp
===================================================================
diff -u -rc081e2b0c9c82fc97d2d39fb7109c9c2f10ff224 -r74865706e83891b502e67d75cad229ca6d6ddcd9
--- lams_tool_forum/web/jsps/authoring/conditionList.jsp	(.../conditionList.jsp)	(revision c081e2b0c9c82fc97d2d39fb7109c9c2f10ff224)
+++ lams_tool_forum/web/jsps/authoring/conditionList.jsp	(.../conditionList.jsp)	(revision 74865706e83891b502e67d75cad229ca6d6ddcd9)
@@ -79,10 +79,15 @@
 
 <%-- This script will works when a new resoruce Condition submit in order to refresh "TaskList List" panel. --%>
 <script type="text/javascript">
-
-	if(window.top != null){
-		window.top.hideConditionMessage();
-		var obj = window.top.document.getElementById('conditionsArea');
-		obj.innerHTML= document.getElementById("conditionList").innerHTML;
+	var win = null;
+	if (window.hideConditionMessage) {
+		win = window;
+	} else if (window.parent && window.parent.hideConditionMessage) {
+		win = window.parent;
+	} else {
+		win = window.top;
 	}
+	win.hideConditionMessage();
+	var obj = win.document.getElementById('conditionsArea');
+	obj.innerHTML= document.getElementById("conditionList").innerHTML;
 </script>
Index: lams_tool_forum/web/jsps/authoring/message/topiclist.jsp
===================================================================
diff -u -r2dbea686e81e6a5843328d8c0bd814b63e64d36f -r74865706e83891b502e67d75cad229ca6d6ddcd9
--- lams_tool_forum/web/jsps/authoring/message/topiclist.jsp	(.../topiclist.jsp)	(revision 2dbea686e81e6a5843328d8c0bd814b63e64d36f)
+++ lams_tool_forum/web/jsps/authoring/message/topiclist.jsp	(.../topiclist.jsp)	(revision 74865706e83891b502e67d75cad229ca6d6ddcd9)
@@ -64,10 +64,15 @@
 </div>
 <%-- This script will works when a new resoruce item submit in order to refresh "Resource List" panel. --%>
 <script lang="javascript">
- 
-	if(window.top != null){
-		window.top.hideMessage();
-		var obj = window.top.document.getElementById('messageListArea');
-		obj.innerHTML= document.getElementById("topiclist").innerHTML;
+	var win = null;
+	if (window.hideMessage) {
+		win = window;
+	} else if (window.parent && window.parent.hideMessage) {
+		win = window.parent;
+	} else {
+		win = window.top;
 	}
+	win.hideMessage();
+	var obj = win.document.getElementById('messageListArea');
+	obj.innerHTML= document.getElementById("topiclist").innerHTML;
 </script>
\ No newline at end of file