diff --git a/app/js/controllers.js b/app/js/controllers.js
index d3dc45b1..2964f879 100644
--- a/app/js/controllers.js
+++ b/app/js/controllers.js
@@ -1193,7 +1193,7 @@ angular.module('myApp.controllers', ['myApp.i18n'])
         $scope.historyState.typing.splice(0, $scope.historyState.typing.length);
         $scope.$broadcast('ui_peer_change');
         $scope.$broadcast('ui_history_change');
-        safeReplaceObject($scope.state, {loaded: true, empty: !peerHistory.messages.length});
+        safeReplaceObject($scope.state, {loaded: true, empty: !peerHistory.messages.length, mayBeHasMore: true});
 
         updateBotActions();
         updateChannelActions();
diff --git a/app/js/directives.js b/app/js/directives.js
index 09f440d0..e8496750 100755
--- a/app/js/directives.js
+++ b/app/js/directives.js
@@ -1412,7 +1412,6 @@ angular.module('myApp.directives', ['myApp.filters'])
         $(historyMessagesEl).css({marginTop: 0});
         var marginTop = scrollableWrap.offsetHeight
                         - historyMessagesEl.offsetHeight
-                        - 20
                         - (Config.Mobile ? 0 : 39);
 
         if (historyMessagesEl.offsetHeight > 0 && marginTop > 0) {
diff --git a/app/partials/desktop/im.html b/app/partials/desktop/im.html
index 4df99cb1..2c3a0c41 100644
--- a/app/partials/desktop/im.html
+++ b/app/partials/desktop/im.html
@@ -112,7 +112,7 @@
                     </div>
 
                     <div class="im_history_messages" ng-class="{im_history_messages_group: historyPeer.id < 0}">
-                      <div class="im_history_loading_more" ng-if="!state.empty" ng-class="{im_history_loading_more_active: state.moreActive}">
+                      <div class="im_history_loading_more" ng-show="state.loaded && (!state.empty || state.mayBeHasMore)" ng-class="{im_history_loading_more_active: state.moreActive}">
                         <div my-arc-progress stroke="3" width="26"></div>
                       </div>
                       <div class="im_history_messages_peer" ng-show="peerHistory.peerID == historyPeer.id" ng-repeat="peerHistory in peerHistories">