diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js
index ea02974f28..19fd967897 100755
--- a/frappe/public/js/frappe/views/communication.js
+++ b/frappe/public/js/frappe/views/communication.js
@@ -354,11 +354,14 @@ frappe.views.CommunicationComposer = Class.extend({
 		var fields = this.dialog.fields_dict;
 		var attach = $(fields.select_attachments.wrapper).find(".attach-list").empty();
 
-		if (cur_frm){
-			var files = cur_frm.get_files();
-		}else {
-			var files = this.attachments
+		var files = [];
+		if (this.attachments && this.attachments.length) {
+			files = files.concat(this.attachments);
 		}
+		if (cur_frm) {
+			files = files.concat(cur_frm.get_files());
+		}
+
 		if(files.length) {
 			$.each(files, function(i, f) {
 				if (!f.file_name) return;