1 files changed, 11 insertions, 0 deletions
diff --git a/web-ui/app/js/mail_view/data/attachment_list.js b/web-ui/app/js/mail_view/data/attachment_list.js
index 9193e37a..d1d07e0c 100644
--- a/web-ui/app/js/mail_view/data/attachment_list.js
+++ b/web-ui/app/js/mail_view/data/attachment_list.js
@@ -32,8 +32,19 @@ define(
                 this.attr.attachments.push(data);
             };
 
+            this.resetAttachmentList = function () {
+                this.attr.attachments = [];
+            };
+
+            this.resetAll = function () {
+              this.resetAttachmentList();
+              this.teardown();
+            };
+
             this.after('initialize', function () {
                 this.on(document, events.mail.appendAttachment, this.addAttachment);
+                this.on(document, events.mail.resetAttachments, this.resetAttachmentList);
+                this.on(document, events.mail.sent, this.resetAll);
             });
         }