Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r6cac5dc66a09730ddbf7ec39b426e5bb37e43920
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java	(.../MessageDao.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java	(.../MessageDao.java)	(revision 6cac5dc66a09730ddbf7ec39b426e5bb37e43920)
@@ -40,7 +40,7 @@
 					+ " where is_authored = true and forum_uid=? order by create_date";
 	
 	private static final String SQL_QUERY_COUNT_SESSION_TOPICS_FROM_AUTHOR = "select count(*) from " + Message.class.getName()
-	+ " as m where m.isAuthored = true and m.toolSession.uid=?";
+	+ " as m where m.isAuthored = true and m.toolSession.sessionId=?";
 	
 	private static final String SQL_QUERY_FIND_CHILDREN = "from " + Message.class.getName()
 					+ " where parent=?";
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
===================================================================
diff -u -r28b3045d39cf68d79a469dfa23e625b3822abfe0 -r6cac5dc66a09730ddbf7ec39b426e5bb37e43920
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision 28b3045d39cf68d79a469dfa23e625b3822abfe0)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision 6cac5dc66a09730ddbf7ec39b426e5bb37e43920)
@@ -473,13 +473,15 @@
 	public void cloneContentTopics(Long contentID, Long sessionID) {
 		//only session does not have content topcis
 		if(!messageDao.hasAuthoredTopics(sessionID)){
+			log.debug("Clone tool content [" + contentID +"] topics for session [" + sessionID + "]");
+			
 			Forum forum = (Forum) forumDao.getByContentId(contentID);
 			Set<Message> contentTopcis = forum.getMessages();
 			
 			//only forum has content topics, clone happens 
 			if(contentTopcis != null && contentTopcis.size() > 0){
 				for(Message msg : contentTopcis){
-					if(msg.getIsAuthored()){
+					if(msg.getIsAuthored() && msg.getToolSession() == null){
 						Message newMsg = Message.newInstance(msg, forumToolContentHandler);
 						createRootTopic(contentID, sessionID, newMsg);
 					}