Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r0967b90c85b0c7e90e3937068c82fb944bf4ccf7
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java	(.../Forum.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java	(.../Forum.java)	(revision 0967b90c85b0c7e90e3937068c82fb944bf4ccf7)
@@ -116,23 +116,14 @@
   				while(iter.hasNext()){
   					Attachment file = (Attachment)iter.next(); 
   					Attachment newFile = (Attachment) file.clone();
-  					//if toolContentHandle is null, just clone old file without duplicate it in repository
-  					if(toolContentHandler != null){
-						//duplicate file node in repository
-						NodeKey keys = toolContentHandler.copyFile(file.getFileUuid());
-						newFile.setFileUuid(keys.getUuid());
-						newFile.setFileVersionId(keys.getVersion());
-  					}
+  					//clone old file without duplicate it in repository
+ 
 					set.add(newFile);
   				}
   				forum.attachments = set;
   			}
 		} catch (CloneNotSupportedException e) {
 			log.error("When clone " + Forum.class + " failed");
-		} catch (ItemNotFoundException e) {
-			log.error("When clone " + Forum.class + " failed");
-		} catch (RepositoryCheckedException e) {
-			log.error("When clone " + Forum.class + " failed");
 		}
   		
   		return forum;
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r0967b90c85b0c7e90e3937068c82fb944bf4ccf7
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java	(.../Message.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java	(.../Message.java)	(revision 0967b90c85b0c7e90e3937068c82fb944bf4ccf7)
@@ -114,22 +114,19 @@
   				while(iter.hasNext()){
   					Attachment file = (Attachment)iter.next();
   					Attachment newFile = (Attachment) file.clone();
-  					if(toolContentHandler != null){
-						//duplicate file node in repository
-						NodeKey keys = toolContentHandler.copyFile(file.getFileUuid());
-						newFile.setFileUuid(keys.getUuid());
-						newFile.setFileVersionId(keys.getVersion());
-  					}
+  					// 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;
   			}
 		} catch (CloneNotSupportedException e) {
 			log.error("When clone " + Forum.class + " failed");
-		} catch (ItemNotFoundException e) {
-			log.error("When clone " + Forum.class + " failed");
-		} catch (RepositoryCheckedException e) {
-			log.error("When clone " + Forum.class + " failed");
 		}
   		
   		return msg;
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
diff -u -r2700025047410d38f40b3bd7c56966a9fc08bb29 -r0967b90c85b0c7e90e3937068c82fb944bf4ccf7
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2700025047410d38f40b3bd7c56966a9fc08bb29)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 0967b90c85b0c7e90e3937068c82fb944bf4ccf7)
@@ -332,7 +332,7 @@
 				Attachment delAtt = (Attachment) iter.next();
 				iter.remove();
 				//delete from repository
-				forumService.deleteFromRepository(delAtt.getFileUuid(),delAtt.getFileVersionId());
+				//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();
@@ -359,7 +359,7 @@
 				Attachment delAtt = (Attachment) iter.next();
 				iter.remove();
 				//delete from repository
-				forumService.deleteFromRepository(delAtt.getFileUuid(),delAtt.getFileVersionId());
+				//forumService.deleteFromRepository(delAtt.getFileUuid(),delAtt.getFileVersionId());
 			}
 			
 			//Handle message