Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java
===================================================================
diff -u -r7a29744349665126baf934f0581681a180d2c806 -r7dd15ff5149a5f87efd7cef5304819bf1bd0b78f
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 7a29744349665126baf934f0581681a180d2c806)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 7dd15ff5149a5f87efd7cef5304819bf1bd0b78f)
@@ -278,8 +278,8 @@
 			Iterator iter = savedFiles.iterator();
 			while (iter.hasNext()) {
 				currAtt = (ChatAttachment) iter.next();
-				if (StringUtils.equals(currAtt.getFileName(), newAtt
-						.getFileName())) {
+				if (StringUtils.equals(currAtt.getFileName(), newAtt.getFileName())
+						&& StringUtils.equals(currAtt.getFileType(), newAtt.getFileType())) {
 					// move from this this list to deleted list.
 					getAttList(KEY_DELETED_FILES, map).add(currAtt);
 					iter.remove();
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
diff -u -rd7adf6de8184f09b4a96db90aa072276d6533067 -r7dd15ff5149a5f87efd7cef5304819bf1bd0b78f
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision d7adf6de8184f09b4a96db90aa072276d6533067)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 7dd15ff5149a5f87efd7cef5304819bf1bd0b78f)
@@ -469,7 +469,8 @@
 		Attachment existAtt;
 		while(iter.hasNext()){
 			existAtt = (Attachment) iter.next();
-			if(StringUtils.equals(existAtt.getFileName(),att.getFileName())){
+			if (StringUtils.equals(existAtt.getFileName(), att.getFileName())
+					&& StringUtils.equals(existAtt.getFileType(), att.getFileType())) {
 				//if there is same name attachment, delete old one
 				deleteAttachmentList.add(existAtt);
 				iter.remove();
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
===================================================================
diff -u -re88d49b5c4d6b37bc23429c39cd6cb1c9905a089 -r7dd15ff5149a5f87efd7cef5304819bf1bd0b78f
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision e88d49b5c4d6b37bc23429c39cd6cb1c9905a089)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 7dd15ff5149a5f87efd7cef5304819bf1bd0b78f)
@@ -679,7 +679,8 @@
 		ResourceAttachment existAtt;
 		while(iter.hasNext()){
 			existAtt = (ResourceAttachment) iter.next();
-			if(StringUtils.equals(existAtt.getFileName(),att.getFileName())){
+			if (StringUtils.equals(existAtt.getFileName(), att.getFileName())
+					&& StringUtils.equals(existAtt.getFileType(), att.getFileType())) {
 				//if there is same name attachment, delete old one
 				deleteAttachmentList.add(existAtt);
 				iter.remove();
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java
===================================================================
diff -u -r926d9c030987f98ae0861c59a637c293c5fdfa1c -r7dd15ff5149a5f87efd7cef5304819bf1bd0b78f
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 926d9c030987f98ae0861c59a637c293c5fdfa1c)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 7dd15ff5149a5f87efd7cef5304819bf1bd0b78f)
@@ -281,8 +281,8 @@
 			Iterator iter = savedFiles.iterator();
 			while (iter.hasNext()) {
 				currAtt = (NotebookAttachment) iter.next();
-				if (StringUtils.equals(currAtt.getFileName(), newAtt
-						.getFileName())) {
+				if (StringUtils.equals(currAtt.getFileName(), newAtt.getFileName())
+						&& StringUtils.equals(currAtt.getFileType(), newAtt.getFileType())) {
 					// move from this this list to deleted list.
 					getAttList(KEY_DELETED_FILES, map).add(currAtt);
 					iter.remove();
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java
===================================================================
diff -u -r533a6ac1aac078a12682ed733e57c03f1e59e626 -r7dd15ff5149a5f87efd7cef5304819bf1bd0b78f
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision 533a6ac1aac078a12682ed733e57c03f1e59e626)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision 7dd15ff5149a5f87efd7cef5304819bf1bd0b78f)
@@ -323,7 +323,8 @@
 		InstructionFiles existAtt;
 		while(iter.hasNext()){
 			existAtt = (InstructionFiles) iter.next();
-			if(StringUtils.equals(existAtt.getName(),att.getName())){
+			if (StringUtils.equals(existAtt.getName(), att.getName())
+					&& StringUtils.equals(existAtt.getType(), att.getType())) {
 				//if there is same name attachment, delete old one
 				deleteAttachmentList.add(existAtt);
 				iter.remove();
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java
===================================================================
diff -u -r7a29744349665126baf934f0581681a180d2c806 -r7dd15ff5149a5f87efd7cef5304819bf1bd0b78f
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 7a29744349665126baf934f0581681a180d2c806)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 7dd15ff5149a5f87efd7cef5304819bf1bd0b78f)
@@ -446,8 +446,8 @@
 			Iterator iter = savedFiles.iterator();
 			while (iter.hasNext()) {
 				currAtt = (ScribeAttachment) iter.next();
-				if (StringUtils.equals(currAtt.getFileName(), newAtt
-						.getFileName())) {
+				if (StringUtils.equals(currAtt.getFileName(), newAtt.getFileName())
+						&& StringUtils.equals(currAtt.getFileType(), newAtt.getFileType())) {
 					// move from this this list to deleted list.
 					getAttList(KEY_DELETED_FILES, map).add(currAtt);
 					iter.remove();
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java
===================================================================
diff -u -r6407bfaad9bba4cc1ad88be51080fd0c5c206e3e -r7dd15ff5149a5f87efd7cef5304819bf1bd0b78f
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 6407bfaad9bba4cc1ad88be51080fd0c5c206e3e)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 7dd15ff5149a5f87efd7cef5304819bf1bd0b78f)
@@ -677,7 +677,8 @@
 		SurveyAttachment existAtt;
 		while(iter.hasNext()){
 			existAtt = (SurveyAttachment) iter.next();
-			if(StringUtils.equals(existAtt.getFileName(),att.getFileName())){
+			if(StringUtils.equals(existAtt.getFileName(),att.getFileName())
+					&& StringUtils.equals(existAtt.getFileType(),att.getFileType())){
 				//if there is same name attachment, delete old one
 				deleteAttachmentList.add(existAtt);
 				iter.remove();
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java
===================================================================
diff -u -r721fa349b42e0b7e2ae19d60756fea47146bfdd4 -r7dd15ff5149a5f87efd7cef5304819bf1bd0b78f
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 721fa349b42e0b7e2ae19d60756fea47146bfdd4)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 7dd15ff5149a5f87efd7cef5304819bf1bd0b78f)
@@ -561,7 +561,8 @@
 		TaskListAttachment existAtt;
 		while(iter.hasNext()){
 			existAtt = (TaskListAttachment) iter.next();
-			if(StringUtils.equals(existAtt.getFileName(),att.getFileName())){
+			if(StringUtils.equals(existAtt.getFileName(),att.getFileName())
+					&& StringUtils.equals(existAtt.getFileType(),att.getFileType())){
 				//if there is same name attachment, delete old one
 				deleteAttachmentList.add(existAtt);
 				iter.remove();