5 files changed, 15 insertions, 5 deletions
diff --git a/web-ui/app/js/mail_list/ui/mail_items/mail_item.js b/web-ui/app/js/mail_list/ui/mail_items/mail_item.js
index 51ace714..24c7b043 100644
--- a/web-ui/app/js/mail_list/ui/mail_items/mail_item.js
+++ b/web-ui/app/js/mail_list/ui/mail_items/mail_item.js
@@ -64,6 +64,7 @@ define(
       this.attr.ident = mail.ident;
       this.attr.statuses = viewHelper.formatStatusClasses(mail.status);
       this.attr.tags = mail.tags;
+      this.attr.attachments = mail.attachments;
       this.attr.mailbox = mail.mailbox;
       this.attr.header.formattedDate = this.formattedDate(mail.header.date);
     };
diff --git a/web-ui/app/js/mail_view/ui/recipients/recipients_input.js b/web-ui/app/js/mail_view/ui/recipients/recipients_input.js
index e9211d85..8f647d01 100644
--- a/web-ui/app/js/mail_view/ui/recipients/recipients_input.js
+++ b/web-ui/app/js/mail_view/ui/recipients/recipients_input.js
@@ -34,7 +34,6 @@ define([
           9: 'tab',
           186: 'semicolon',
           188: 'comma',
-          32: 'space',
           13: 'enter',
           27: 'esc'
         },
@@ -101,7 +100,7 @@ define([
           return;
         }
 
-        if (isEnterAddressKey(keyPressed)) {
+        if (!event.shiftKey && isEnterAddressKey(keyPressed)) {
           this.tokenizeRecipient(event);
 
           if ((keyPressed !== 9 /* tab */)) {
diff --git a/web-ui/app/scss/styles.scss b/web-ui/app/scss/styles.scss
index ef3691f0..7fe0ec05 100644
--- a/web-ui/app/scss/styles.scss
+++ b/web-ui/app/scss/styles.scss
@@ -133,6 +133,11 @@
         right: 10px;
         font-size: 0.7em;
       }
+
+      .attachment-indicator {
+        margin: 2px 0 0 25px;
+        font-size: initial;
+      }
       .from {
         white-space: nowrap;
         font-size: 0.8em;
diff --git a/web-ui/app/templates/mails/full_view.hbs b/web-ui/app/templates/mails/full_view.hbs
index 4cdf25b9..d05537f3 100644
--- a/web-ui/app/templates/mails/full_view.hbs
+++ b/web-ui/app/templates/mails/full_view.hbs
@@ -69,7 +69,7 @@
     {{#if attachments}}
       <div class="attachmentsAreaWrap">
         <div class="attachmentsArea column large-12">
-        <p><strong> {{ attachments.length }} attachment(s):</strong></p>
+        <p><strong><i class="fa fa-paperclip"></i> {{ attachments.length }} attachment(s):</strong></p>
           <ul>
           {{#each attachments }}
             <li>
diff --git a/web-ui/app/templates/mails/single.hbs b/web-ui/app/templates/mails/single.hbs
index baf6251c..997ab44f 100644
--- a/web-ui/app/templates/mails/single.hbs
+++ b/web-ui/app/templates/mails/single.hbs
@@ -3,8 +3,13 @@
 </span>
 <span>
     <a href="/#/{{ tag }}/mail/{{ ident }}">
-        <span class="received-date">{{ header.formattedDate }}</span>
-
+        <span class="received-date">{{ header.formattedDate }}
+          {{#if attachments}}
+            <div class="attachment-indicator">
+              <i class="fa fa-paperclip"></i>
+            </div>
+          {{/if}}
+        </span>
         <div class="from">{{#if header.from }}{{ header.from }}{{else}}{{t "you"}}{{/if}}</div>
         <div class="subject-and-tags">
           {{ header.subject }}