3 files changed, 20 insertions, 14 deletions
diff --git a/web-ui/app/scss/styles.scss b/web-ui/app/scss/styles.scss
index 0baa2d6b..8c8f78a6 100644
--- a/web-ui/app/scss/styles.scss
+++ b/web-ui/app/scss/styles.scss
@@ -104,15 +104,19 @@
         }
       }
       .subject-and-tags {
-        display: inline-block;
+        display: block;
         width: 90%;
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;
         @include tags;
         ul.tags {
-          display: inline-block;
+          display: block;
+          line-height: 1.2;
+          margin: -3px 0 0 0;
           li {
+            background-color: #DDD;
+            color: black; 
             display: inline-block;
             height: auto;
             font-weight: 400;
diff --git a/web-ui/app/templates/mails/sent.hbs b/web-ui/app/templates/mails/sent.hbs
index 826a66d5..1bd907e4 100644
--- a/web-ui/app/templates/mails/sent.hbs
+++ b/web-ui/app/templates/mails/sent.hbs
@@ -2,22 +2,24 @@
   <input type="checkbox"/>
 </span>
 <span>
-  <a href="/#/{{ tag }}/mail/{{ ident }}">
+  <a href="/#/{{ tag }}/mail/{{ ident }}">  
     <span class="sent-date">{{ header.formattedDate }}</span>
 
     <div class="from">{{t 'to:'}} {{#if header.to }}{{
       header.to }}{{else}}{{t 'no_recipient'}}{{/if}}</div>
     <div class="subject-and-tags">
-      <ul class="tags">
-        {{#each tagsForListView }}
-            <li class="tag" data-tag="{{this}}">{{ this }}</li>
-        {{/each }}
-      </ul>
       {{#if header.subject }}
         {{header.subject}}
       {{else}}
         {{t 'no_subject'}}
       {{/if}}
     </div>
+    <div class="subject-and-tags">
+      <ul class="tags">
+        {{#each tagsForListView }}
+            <li class="tag" data-tag="{{this}}">{{ this }}</li>
+        {{/each }}
+      </ul>
+    </div>
   </a>
 </span>
diff --git a/web-ui/app/templates/mails/single.hbs b/web-ui/app/templates/mails/single.hbs
index 9a054c79..8edcb87c 100644
--- a/web-ui/app/templates/mails/single.hbs
+++ b/web-ui/app/templates/mails/single.hbs
@@ -7,13 +7,13 @@
 
     <div class="from">{{#if header.from }}{{ header.from }}{{else}}{{t "you"}}{{/if}}</div>
     <div class="subject-and-tags">
-        <ul class="tags">
-          {{#each tagsForListView }}
-              <li class="tag" data-tag="{{this}}">{{ this }}</li>
-          {{/each }}
-        </ul>
-
       {{ header.subject }}
     </div>
+    <div class="subject-and-tags">
+      <ul class="tags">
+        {{#each tagsForListView }}
+            <li class="tag" data-tag="{{this}}">{{ this }}</li>
+        {{/each }}
+      </ul>
 </a>
 </span>