From 2aed77ab0f0a9400341b6c43518953047ff588c2 Mon Sep 17 00:00:00 2001
From: Igor Zhukov <igor.beatle@gmail.com>
Date: Sat, 15 Feb 2014 10:14:23 +0400
Subject: [PATCH] merged with master

---
 css/app.css      | 4 +++-
 partials/im.html | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/css/app.css b/css/app.css
index 05178b14..51d97333 100644
--- a/css/app.css
+++ b/css/app.css
@@ -1846,7 +1846,9 @@ img.img_fullsize {
   background: #f2f6fa;
 }
 .im_message_selected .im_message_date,
-.im_history_selectable .im_message_outer_wrap:hover .im_message_date {
+.im_message_selected .im_message_fwd_header,
+.im_history_selectable .im_message_outer_wrap:hover .im_message_date,
+.im_history_selectable .im_message_outer_wrap:hover .im_message_fwd_header {
   color: #91a6ba;
 }
 
diff --git a/partials/im.html b/partials/im.html
index 134ca404..6b012842 100644
--- a/partials/im.html
+++ b/partials/im.html
@@ -54,7 +54,8 @@
                 </a>
 
                 <h4 ng-if="mediaType !== false" ng-switch="mediaType">
-                  <span ng-switch-when="photos"> Photos &amp; Videos </span>
+                  <span ng-switch-when="photos"> Photos </span>
+                  <span ng-switch-when="video"> Video </span>
                   <span ng-switch-when="documents"> Documents </span>
                 </h4>