5 files changed, 17 insertions, 7 deletions

diff --git a/web-ui/app/js/mail_view/ui/attachment_list.js b/web-ui/app/js/mail_view/ui/attachment_list.js
index 65c7ee09..8428f4a3 100644
--- a/web-ui/app/js/mail_view/ui/attachment_list.js
+++ b/web-ui/app/js/mail_view/ui/attachment_list.js
@@ -50,13 +50,15 @@ define(
             this.renderAttachmentListView = function (data) {
                 var currentHtml = this.select('attachmentListItem').html();
                 var item = this.buildAttachmentListItem(data);
-                this.select('attachmentListItem').html(currentHtml + '<li>' + item + '</li>');
+                this.select('attachmentListItem').html(currentHtml + item);
             };
 
             this.buildAttachmentListItem = function (attachment) {
-                return '<a href="' + this.attr.attachmentBaseUrl + '/' + attachment.ident + '?filename=' +
-                    attachment.name + '&encoding=' + attachment.encoding + '">' + attachment.name + ' <span class="attachment-size"> (' + viewHelper.formatSize(attachment.size) + ')' +
-                    '</span></a>';
+                var attachmentData = {ident: attachment.ident,
+                                      encoding: attachment.encoding,
+                                      name: attachment.name,
+                                      size: attachment.size};
+                return templates.compose.attachmentItem(attachmentData);
             };
 
             this.addJqueryFileUploadConfig = function() {
diff --git a/web-ui/app/js/mail_view/ui/forward_box.js b/web-ui/app/js/mail_view/ui/forward_box.js
index fe748365..2f848430 100644
--- a/web-ui/app/js/mail_view/ui/forward_box.js
+++ b/web-ui/app/js/mail_view/ui/forward_box.js
@@ -44,7 +44,8 @@ define(
         this.renderInlineCompose('forward-box', {
           subject: this.attr.subject,
           recipients: { to: [], cc: []},
-          body: viewHelper.quoteMail(mail)
+          body: viewHelper.quoteMail(mail),
+          attachments: mail.attachments
         });
 
         this.on(this.select('subjectDisplay'), 'click', this.showSubjectInput);
diff --git a/web-ui/app/js/mail_view/ui/mail_view.js b/web-ui/app/js/mail_view/ui/mail_view.js
index 093f498d..ba4d6e85 100644
--- a/web-ui/app/js/mail_view/ui/mail_view.js
+++ b/web-ui/app/js/mail_view/ui/mail_view.js
@@ -46,11 +46,15 @@ define(
       this.displayMail = function (event, data) {
         this.attr.mail = data.mail;
 
-        var signed, encrypted;
+        var signed, encrypted, attachments;
 
         data.mail.security_casing = data.mail.security_casing || {};
         signed = this.checkSigned(data.mail);
         encrypted = this.checkEncrypted(data.mail);
+        attachments = data.mail.attachments.map(function (attachment) { 
+            attachment.received = true;
+            return attachment;
+        });
 
         if(data.mail.mailbox === 'sent') {
           encrypted = undefined;
@@ -64,7 +68,7 @@ define(
           tags: data.mail.tags,
           encryptionStatus: encrypted,
           signatureStatus: signed,
-          attachments: data.mail.attachments
+          attachments: attachments
         }));
 
         this.$node.find('.bodyArea').html(viewHelpers.formatMailBody(data.mail));
diff --git a/web-ui/app/js/mixins/with_compose_inline.js b/web-ui/app/js/mixins/with_compose_inline.js
index 83a1a1fb..b8266f28 100644
--- a/web-ui/app/js/mixins/with_compose_inline.js
+++ b/web-ui/app/js/mixins/with_compose_inline.js
@@ -29,6 +29,7 @@ define(
       this.defaultAttrs({
         subjectDisplay: '#reply-subject',
         subjectInput: '#subject-container input',
+        forwardBox: '#forward-box',
         recipientsDisplay: '#all-recipients'
       });
 
diff --git a/web-ui/app/js/views/templates.js b/web-ui/app/js/views/templates.js
index c799b052..e5a3c435 100644
--- a/web-ui/app/js/views/templates.js
+++ b/web-ui/app/js/views/templates.js
@@ -28,6 +28,7 @@ define(['hbs/templates'], function (templates) {
       recipients: window.Pixelated['app/templates/compose/recipients.hbs'],
       feedback: window.Pixelated['app/templates/compose/feedback_box.hbs'],
       attachmentsList: window.Pixelated['app/templates/compose/attachments_list.hbs'],
+      attachmentItem: window.Pixelated['app/templates/compose/attachment_item.hbs'],
       uploadAttachmentFailed: window.Pixelated['app/templates/compose/upload_attachment_failed.hbs']
     },
     tags: {
@@ -74,6 +75,7 @@ define(['hbs/templates'], function (templates) {
   Handlebars.registerPartial('tag_inner', Templates.tags.tagInner);
   Handlebars.registerPartial('recipients', Templates.compose.recipients);
   Handlebars.registerPartial('attachments_list', Templates.compose.attachmentsList);
+  Handlebars.registerPartial('attachment_item', Templates.compose.attachmentItem);
   Handlebars.registerPartial('uploadAttachmentFailed', Templates.compose.uploadAttachmentFailed);
 
   return Templates;