diff --git a/background.html b/background.html
index 1b177c9f..497b10a1 100644
--- a/background.html
+++ b/background.html
@@ -176,7 +176,9 @@
         {{ /hasRetry }}
         <table>
           <tr><td class='label'>Sent</td><td> {{ sent_at }}</td></tr>
-          <tr><td class='label'>Received</td><td> {{ received_at }}</td></tr>
+          {{ #received_at }}
+            <tr><td class='label'>Received</td><td> {{ received_at }}</td></tr>
+          {{ /received_at }}
           {{ #errors }}
             <tr>
               <td class='label'>Error</td>
diff --git a/js/views/message_detail_view.js b/js/views/message_detail_view.js
index d910c6d4..d77cd854 100644
--- a/js/views/message_detail_view.js
+++ b/js/views/message_detail_view.js
@@ -109,7 +109,7 @@
             });
             this.$el.html(Mustache.render(_.result(this, 'template', ''), {
                 sent_at     : moment(this.model.get('sent_at')).toString(),
-                received_at : moment(this.model.get('received_at')).toString(),
+                received_at : this.model.isIncoming() ? moment(this.model.get('received_at')).toString() : null,
                 tofrom      : this.model.isIncoming() ? 'From' : 'To',
                 errors      : this.errors['undefined'],
                 hasRetry    : hasRetry