diff --git a/app/css/app.css b/app/css/app.css
index cac26f86..605dc11f 100644
--- a/app/css/app.css
+++ b/app/css/app.css
@@ -957,17 +957,8 @@ a.tg_radio_on:hover i.icon-radio {
 }
 
 .im_dialogs_tabs_wrap {
-  overflow: hidden;
-  height: 0;
-  -webkit-transition    : height ease-out 0.3s;
-  -moz-transition       : height ease-out 0.3s;
-  -o-transition         : height ease-out 0.3s;
-  transition            : height ease-out 0.3s;
-}
-.im_dialogs_tabs_wrap.shown {
-  height: 38px;
+  display: none;
 }
-
 .im_dialogs_tabs {
   padding: 4px 0;
   position: relative;
@@ -2977,17 +2968,10 @@ a.contacts_modal_contact:hover .contacts_modal_contact_status {
 .is_1x .icon-delete {
   background-image: url(../img/icons/IconsetW_1x.png);
 }
-.im_message_selected {
-  background: #f2f6fa;
-}
+.im_message_selected,
 .im_message_focus {
-  background-color: #f2f6fa;
-  -webkit-transition: background-color linear 1s;
-  transition: background-color linear 1s;
+  background: #f2f6fa;
 }
-/*.im_message_focus.inactive {
-  background-color: none;
-}*/
 
 .im_history_selectable .im_message_outer_wrap {
   cursor: pointer;
@@ -2995,11 +2979,15 @@ a.contacts_modal_contact:hover .contacts_modal_contact_status {
 .im_history_selectable .im_message_outer_wrap:hover {
   background: #f2f6fa;
 }
+
 .im_message_selected .im_message_date,
 .im_message_selected .im_message_fwd_header,
+.im_message_selected .im_message_document_size,
+.im_message_focus .im_message_date,
+.im_message_focus .im_message_fwd_header,
+.im_message_focus .im_message_document_size,
 .im_history_selectable .im_message_outer_wrap:hover .im_message_date,
 .im_history_selectable .im_message_outer_wrap:hover .im_message_fwd_header,
-.im_message_selected .im_message_document_size,
 .im_history_selectable .im_message_outer_wrap:hover .im_message_document_size {
   color: #68839c;
 }
diff --git a/app/js/directives.js b/app/js/directives.js
index 3154fd15..73459dde 100644
--- a/app/js/directives.js
+++ b/app/js/directives.js
@@ -54,17 +54,8 @@ angular.module('myApp.directives', ['myApp.filters'])
 
       attrs.$observe('hasTabs', function (newValue) {
         newValue = newValue == 'true';
-        if (newValue) {
-          $scope.$broadcast('ui_dialogs_tabs', true);
-        }
-        var trigger = function () {
-          $(tabsWrap)[newValue ? 'addClass' : 'removeClass']('shown');
-        }
-        $transition($(tabsWrap), trigger).then(function () {
-          if (!newValue) {
-            $scope.$broadcast('ui_dialogs_tabs', false);
-          }
-        });
+        $(tabsWrap).toggle(newValue);
+        $scope.$broadcast('ui_dialogs_tabs', newValue);
       });
 
       $(document).on('keydown', onKeyDown);
@@ -180,8 +171,7 @@ angular.module('myApp.directives', ['myApp.filters'])
   .directive('myDialogsList', function($window, $timeout) {
 
     return {
-      link: link,
-      scope: true
+      link: link
     };
 
 
@@ -489,6 +479,7 @@ angular.module('myApp.directives', ['myApp.filters'])
       $scope.$on('ui_history_append', function () {
         var sh = scrollableWrap.scrollHeight;
         onContentLoaded(function () {
+          atBottom = false;
           updateBottomizer();
           lessNotified = false;