diff --git a/app/css/app.css b/app/css/app.css
index 97d0e528..2bc96074 100644
--- a/app/css/app.css
+++ b/app/css/app.css
@@ -1318,7 +1318,6 @@ a.im_dialog:hover .im_dialog_date {
 }
 .im_message_grouped .icon-message-status {
   margin-top: 5px;
-  margin-left: 24px;
 }
 
 .im_message_from_photo,
@@ -1717,7 +1716,6 @@ img.im_message_document_thumb {
 }
 
 .icon-message-status-tick {
-  /*display: inline-block;*/
   display: none;
   width: 16px;
   height: 10px;
@@ -2926,7 +2924,6 @@ a.contacts_modal_contact:hover .contacts_modal_contact_status {
   }
   .im_message_grouped .icon-message-status {
     margin-top: -8px;
-    margin-left: 32px;
   }
 }
 
diff --git a/app/js/controllers.js b/app/js/controllers.js
index 0d0eddcc..99774036 100644
--- a/app/js/controllers.js
+++ b/app/js/controllers.js
@@ -406,7 +406,7 @@ angular.module('myApp.controllers', [])
         return;
       }
 
-      if (!hasMore && !$scope.search.query) {
+      if (!hasMore && $scope.search.query) {
         contactsShown = true;
 
         AppUsersManager.getContacts($scope.search.query).then(function (contactsList) {
@@ -612,6 +612,7 @@ angular.module('myApp.controllers', [])
         updateHistoryPeer();
         safeReplaceObject($scope.state, {loaded: true});
 
+        $scope.history = [];
         angular.forEach(historyResult.history, function (id) {
           $scope.history.push(AppMessagesManager.wrapForHistory(id));
         });