diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index efed773b8c5..0b3bddffde1 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -243,8 +243,9 @@ openerp.mail = function (session) {
         /* Convert date, timerelative and avatar in displayable data. */
         format_data: function () {
             //formating and add some fields for render
-            if (this.date && new Date().getTime()-Date.parse((this.date+'').split('.')[0]).getTime() < 7*24*60*60*1000) {
-                this.timerelative = $.timeago(this.date+"Z");
+            this.date = this.date ? session.web.str_to_datetime(this.date) : false;
+            if (this.date && new Date().getTime()-this.date.getTime() < 7*24*60*60*1000) {
+                this.timerelative = $.timeago(this.date);
             } 
             if (this.type == 'email' && (!this.author_id || !this.author_id[0])) {
                 this.avatar = ('/mail/static/src/img/email_icon.png');