4 files changed, 7 insertions, 7 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 55d116d2..a5c41121 100644
--- a/web-ui/app/templates/mails/full_view.hbs
+++ b/web-ui/app/templates/mails/full_view.hbs
@@ -34,7 +34,7 @@
             {{{formatRecipients header}}}
         </div>
         <div class="recipients column large-2 text-right">
-            <span class="received-date">{{ header.formattedDate }}</span>
+            <span class="received-date">{{ formatDate header.date }}</span>
         </div>
         <div>
             <h3 class="subjectArea column large-10 no-padding">
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>