diff --git a/app/js/controllers.js b/app/js/controllers.js
index d0b63457..2b95ac21 100644
--- a/app/js/controllers.js
+++ b/app/js/controllers.js
@@ -1017,7 +1017,6 @@ angular.module('myApp.controllers', [])
       if (searchCachedResult.history.indexOf($scope.messageID) >= 0) {
         list = searchCachedResult.history;
         maxID = list[list.length - 1];
-        hasMore = list.length < searchCachedResult.count;
 
         updatePrevNext();
       }
@@ -1050,10 +1049,14 @@ angular.module('myApp.controllers', [])
       if (loadingPromise) return loadingPromise;
 
       return loadingPromise = AppMessagesManager.getSearch(inputPeer, inputQuery, inputFilter, maxID).then(function (searchResult) {
-        maxID = searchResult.history[searchResult.history.length - 1];
-        list = list.concat(searchResult.history);
+        if (searchResult.history.length) {
+          maxID = searchResult.history[searchResult.history.length - 1];
+          list = list.concat(searchResult.history);
+          hasMore = list.length < searchResult.count;
+        } else {
+          hasMore = false;
+        }
 
-        hasMore = list.length < searchResult.count;
         updatePrevNext();
         loadingPromise = false;
       });
diff --git a/app/partials/confirm_modal.html b/app/partials/confirm_modal.html
index 69fe94ca..15094536 100644
--- a/app/partials/confirm_modal.html
+++ b/app/partials/confirm_modal.html
@@ -20,7 +20,7 @@
         </ng-pluralize>
       </span>
       <span ng-switch-when="FILE_CLIPBOARD_PASTE">Are you sure to send file(s) from clipboard?</span>
-      <span ng-switch-when="MESSAGE_DELETE">Are you sure to delete the message?</span>
+      <span ng-switch-when="MESSAGE_DELETE">Are you sure you want to delete the message?</span>
       <div ng-switch-when="LOGIN_PHONE_CORRECT">
         Is this phone number correct?
         <div class="confirm_phone_number"> <span ng-bind="country_code"></span> <span ng-bind="phone_number"></span> </div>