Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/Chat.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -ra96c5d0aeb2e25ac3d9241c5b8ce836eb6248355
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/Chat.java	(.../Chat.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/Chat.java	(.../Chat.java)	(revision a96c5d0aeb2e25ac3d9241c5b8ce836eb6248355)
@@ -430,20 +430,14 @@
 			chat.setUid(null);
 
 			if (chatAttachments != null) {
-				// create a copy of the attachments
+				// create a copy of the attachments but do not duplicate node in repository
 				Iterator iter = chatAttachments.iterator();
 				Set<ChatAttachment> set = new HashSet<ChatAttachment>();
 				while (iter.hasNext()) {
 					ChatAttachment originalFile = (ChatAttachment) iter.next();
 					ChatAttachment newFile = (ChatAttachment) originalFile
 							.clone();
-					if (toolContentHandler != null) {
-						// duplicate file node in repository
-						NodeKey keys = toolContentHandler.copyFile(originalFile
-								.getFileUuid());
-						newFile.setFileUuid(keys.getUuid());
-						newFile.setFileVersionId(keys.getVersion());
-					}
+					
 					set.add(newFile);
 				}
 				chat.chatAttachments = set;
@@ -453,10 +447,6 @@
 
 		} catch (CloneNotSupportedException cnse) {
 			log.error("Error cloning " + Chat.class);
-		} catch (ItemNotFoundException infe) {
-			log.error("Item Not found " + Chat.class);
-		} catch (RepositoryCheckedException rce) {
-			log.error("Repository checked exception " + Chat.class);
 		}
 		return chat;
 	}
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java
===================================================================
diff -u -ra1523835943285424159f4719d51af2794f94846 -ra96c5d0aeb2e25ac3d9241c5b8ce836eb6248355
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision a1523835943285424159f4719d51af2794f94846)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision a96c5d0aeb2e25ac3d9241c5b8ce836eb6248355)
@@ -169,9 +169,7 @@
 		}
 
 		for (ChatAttachment att : getAttList(KEY_DELETED_FILES, map)) {
-			// remove from repository and db
-			chatService.deleteFromRepository(att.getFileUuid(), att
-					.getFileVersionId());
+			// leave in repository but remove from db
 			attachments.remove(att);
 		}