5 files changed, 13 insertions, 14 deletions
diff --git a/web-ui/app/templates/mails/draft.hbs b/web-ui/app/templates/mails/draft.hbs
index 87862f34..c3d2fa5b 100644
--- a/web-ui/app/templates/mails/draft.hbs
+++ b/web-ui/app/templates/mails/draft.hbs
@@ -2,8 +2,8 @@
   <input type="checkbox"/>
 </span>
 <span>
-  <a href="/#/{{ tag }}/mail/{{ ident }}">
-    <span class="sent-date">{{ header.formattedDate }}</span>
+  <a href="/#/{{ currentTag }}/mail/{{ ident }}">
+    <span class="sent-date">{{ formatDate header.date }}</span>
 
     <div class="from">
       {{t 'to:'}}
diff --git a/web-ui/app/templates/mails/full_view.hbs b/web-ui/app/templates/mails/full_view.hbs
index 50ac2776..77994860 100644
--- a/web-ui/app/templates/mails/full_view.hbs
+++ b/web-ui/app/templates/mails/full_view.hbs
@@ -8,9 +8,9 @@
         </button>
 
 
-      <div style="display:inline-block;padding-top: 5px;width:95%;flex-shrink:1" >
+      <div class="full-view-header">
 
-        <div class="column large-10 no-padding security-status">
+        <div class="column large-12 no-padding security-status">
             {{#if signatureStatus}}
             <span class="{{signatureStatus}}">
               {{t signatureStatus }}
@@ -22,10 +22,7 @@
             </span>
             {{/if}}
         </div>
-        <div class="column large-2 no-padding text-right">
-            <span class="received-date">{{ header.formattedDate }}</span>
-        </div>
-        <div class="recipients column large-12 no-padding">
+        <div class="recipients column large-10 no-padding">
             <span class="from">
               {{#if header.from }}
                 {{ header.from }}
@@ -36,7 +33,9 @@
             <i class="fa fa-long-arrow-right"></i>
             {{{formatRecipients header}}}
         </div>
-
+        <div class="recipients column large-2 text-right">
+            <span class="received-date">{{ formatDate header.date }}</span>
+        </div>
         <div>
             <h3 class="subjectArea column large-10 no-padding">
                 <span class="subject">{{ header.subject }}</span>
diff --git a/web-ui/app/templates/mails/sent.hbs b/web-ui/app/templates/mails/sent.hbs
index e4b49b37..a0712124 100644
--- a/web-ui/app/templates/mails/sent.hbs
+++ b/web-ui/app/templates/mails/sent.hbs
@@ -2,8 +2,8 @@
   <input type="checkbox"/>
 </span>
 <span>
-  <a href="/#/{{ tag }}/mail/{{ ident }}">
-    <span class="sent-date">{{ header.formattedDate }}</span>
+  <a href="/#/{{ currentTag }}/mail/{{ ident }}">
+    <span class="sent-date">{{ formatDate header.date }}</span>
 
     <div class="from">
       {{t 'to:'}}
diff --git a/web-ui/app/templates/mails/single.hbs b/web-ui/app/templates/mails/single.hbs
index 90023713..47d600fb 100644
--- a/web-ui/app/templates/mails/single.hbs
+++ b/web-ui/app/templates/mails/single.hbs
@@ -2,8 +2,8 @@
   <input type="checkbox" {{#if isChecked }}checked="true"{{/if}} />
 </span>
 <span>
-  <a href="/#/{{ tag }}/mail/{{ ident }}">
-    <span class="received-date">{{ header.formattedDate }}
+  <a href="/#/{{ currentTag }}/mail/{{ ident }}">
+    <span class="received-date">{{ formatDate header.date }}
       {{#if attachments}}
         <div class="attachment-indicator">
           <i class="fa fa-paperclip"></i>
diff --git a/web-ui/app/templates/mails/trash.hbs b/web-ui/app/templates/mails/trash.hbs
index a74c9606..4475aeb0 100644
--- a/web-ui/app/templates/mails/trash.hbs
+++ b/web-ui/app/templates/mails/trash.hbs
@@ -2,7 +2,7 @@
   <input type="checkbox" {{#if isChecked }}checked="true"{{/if}} />
 </span>
 <span>
-  <a href="/#/{{ tag }}/mail/{{ ident }}">
+  <a href="/#/{{ currentTag }}/mail/{{ ident }}">
     <span class="received-date">{{ header.formattedDate }}
       {{#if attachments}}
         <div class="attachment-indicator">