3 files changed, 13 insertions, 8 deletions
diff --git a/web-ui/app/js/helpers/view_helper.js b/web-ui/app/js/helpers/view_helper.js
index 8d841cc7..e4e9277d 100644
--- a/web-ui/app/js/helpers/view_helper.js
+++ b/web-ui/app/js/helpers/view_helper.js
@@ -121,11 +121,19 @@ define(
     }
   }
 
+  function formatSize(bytes) {
+    var e = Math.floor(Math.log(bytes) / Math.log(1024));
+    return (bytes / Math.pow(1024, e)).toFixed(2) + ' ' + ' KMGTP'.charAt(e) + 'b';
+  }
+
+
   Handlebars.registerHelper('formatDate', formatDate);
+  Handlebars.registerHelper('formatSize', formatSize);
   Handlebars.registerHelper('formatStatusClasses', formatStatusClasses);
 
   return {
     formatStatusClasses: formatStatusClasses,
+    formatSize: formatSize,
     formatMailBody: formatMailBody,
     moveCaretToEndOfText: moveCaretToEndOfText,
     quoteMail: quoteMail,
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 32a48d0b..632242ca 100644
--- a/web-ui/app/js/mail_view/ui/attachment_list.js
+++ b/web-ui/app/js/mail_view/ui/attachment_list.js
@@ -17,10 +17,11 @@
 
 define(
     [
-        'page/events'
+        'page/events',
+        'helpers/view_helper'
     ],
 
-    function (events) {
+    function (events, viewHelper) {
         'use strict';
 
         function attachmentList() {
@@ -54,7 +55,7 @@ define(
 
             this.buildAttachmentListItem = function (attachment) {
                 return '<a href="' + this.attr.attachmentBaseUrl + '/' + attachment.ident + '?filename=' +
-                    attachment.name + '&encoding=' + attachment.encoding + '">' + attachment.name + ' (' + humanReadable(attachment.size) + ')' +
+                    attachment.name + '&encoding=' + attachment.encoding + '">' + attachment.name + ' (' + viewHelper.formatSize(attachment.size) + ')' +
                     '</a>';
             };
 
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 76c5b7d9..093f498d 100644
--- a/web-ui/app/js/mail_view/ui/mail_view.js
+++ b/web-ui/app/js/mail_view/ui/mail_view.js
@@ -56,10 +56,6 @@ define(
           encrypted = undefined;
         }
 
-        var attachments = _.map(data.mail.attachments, function(a){
-            return { 'encoding': a.encoding, 'name': a.name, 'ident': a.ident };
-        });
-
         this.$node.html(templates.mails.fullView({
           header: data.mail.header,
           body: [],
@@ -68,7 +64,7 @@ define(
           tags: data.mail.tags,
           encryptionStatus: encrypted,
           signatureStatus: signed,
-          attachments: attachments
+          attachments: data.mail.attachments
         }));
 
         this.$node.find('.bodyArea').html(viewHelpers.formatMailBody(data.mail));