Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java
===================================================================
diff -u -r0967b90c85b0c7e90e3937068c82fb944bf4ccf7 -rd0ecaecbdc41491149a4237b074714b33828c304
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java	(.../Message.java)	(revision 0967b90c85b0c7e90e3937068c82fb944bf4ccf7)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java	(.../Message.java)	(revision d0ecaecbdc41491149a4237b074714b33828c304)
@@ -115,12 +115,6 @@
   					Attachment file = (Attachment)iter.next();
   					Attachment newFile = (Attachment) file.clone();
   					// use common file node in repository
-//  					if(toolContentHandler != null){
-//						//duplicate file node in repository
-//						NodeKey keys = toolContentHandler.copyFile(file.getFileUuid());
-//						newFile.setFileUuid(keys.getUuid());
-//						newFile.setFileVersionId(keys.getVersion());
-//  					}
   					set.add(newFile);
   				}
   				msg.attachments = set;
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
diff -u -r0967b90c85b0c7e90e3937068c82fb944bf4ccf7 -rd0ecaecbdc41491149a4237b074714b33828c304
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 0967b90c85b0c7e90e3937068c82fb944bf4ccf7)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision d0ecaecbdc41491149a4237b074714b33828c304)
@@ -331,8 +331,6 @@
 			while(iter.hasNext()){
 				Attachment delAtt = (Attachment) iter.next();
 				iter.remove();
-				//delete from repository
-				//forumService.deleteFromRepository(delAtt.getFileUuid(),delAtt.getFileVersionId());
 				//it is an existed att, then delete it from current attachmentPO
 				if(delAtt.getUid() != null){
 					Iterator attIter = attPOSet.iterator();
@@ -358,8 +356,6 @@
 			while(iter.hasNext()){
 				Attachment delAtt = (Attachment) iter.next();
 				iter.remove();
-				//delete from repository
-				//forumService.deleteFromRepository(delAtt.getFileUuid(),delAtt.getFileVersionId());
 			}
 			
 			//Handle message