From 71e216ddff343612075419d8864bd11bc2353158 Mon Sep 17 00:00:00 2001
From: Ben Gotow <bengotow@gmail.com>
Date: Tue, 24 Feb 2015 16:24:01 -0800
Subject: [PATCH] fix(messages): Timestamp display issue after merge

---
 internal_packages/message-list/lib/message-item.cjsx      | 2 +-
 internal_packages/message-list/lib/message-timestamp.cjsx | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/internal_packages/message-list/lib/message-item.cjsx b/internal_packages/message-list/lib/message-item.cjsx
index f562ac5cf..d5d57a5b7 100644
--- a/internal_packages/message-list/lib/message-item.cjsx
+++ b/internal_packages/message-list/lib/message-item.cjsx
@@ -44,7 +44,7 @@ MessageItem = React.createClass
 
     header =
       <header className="message-header" onClick={@_onToggleCollapsed}>
-        <MessageTimestamp date={@props.message.date} />
+        <MessageTimestamp className="message-time" date={@props.message.date} />
         <div className="message-actions">
           {<Action thread={@props.thread} message={@props.message} /> for Action in messageActions}
         </div>
diff --git a/internal_packages/message-list/lib/message-timestamp.cjsx b/internal_packages/message-list/lib/message-timestamp.cjsx
index 72d41c89e..77db56d3b 100644
--- a/internal_packages/message-list/lib/message-timestamp.cjsx
+++ b/internal_packages/message-list/lib/message-timestamp.cjsx
@@ -6,9 +6,10 @@ MessageTimestamp = React.createClass
   displayName: 'MessageTimestamp'
   propTypes:
     date: React.PropTypes.object.isRequired,
+    className: React.PropTypes.string,
 
   render: ->
-    <div>{moment(@props.date).format(@_timeFormat())}</div>
+    <div className={@props.className}>{moment(@props.date).format(@_timeFormat())}</div>
 
   _timeFormat: ->
     today = moment(@_today())