diff --git a/app/js/controllers.js b/app/js/controllers.js
index 6c7cc816..703bb25f 100644
--- a/app/js/controllers.js
+++ b/app/js/controllers.js
@@ -1251,6 +1251,7 @@ angular.module('myApp.controllers', [])
       switch (update._) {
         case 'updateUserTyping':
         case 'updateChatUserTyping':
+          AppUsersManager.forceUserOnline(update.user_id);
           if (AppUsersManager.hasUser(update.user_id) &&
               $scope.curDialog.peerID == (update._ == 'updateUserTyping'
                 ? update.user_id
diff --git a/app/js/services.js b/app/js/services.js
index 28381f99..6d984f18 100644
--- a/app/js/services.js
+++ b/app/js/services.js
@@ -163,13 +163,21 @@ angular.module('myApp.services', [])
     var timestampNow = tsNow(true) + serverTimeOffset;
     angular.forEach(users, function (user) {
       if (user.status && user.status._ == 'userStatusOnline' &&
-          user.status.expires > timestampNow) {
+          user.status.expires < timestampNow) {
         user.status = {_: 'userStatusOffline', was_online: user.status.expires};
         $rootScope.$broadcast('user_update', user.id);
       }
     });
   }
 
+  function forceUserOnline (id) {
+    var user = getUser(id);
+    if (user && (!user.status || user.status._ != 'userStatusOnline')) {
+      user.status = {_: 'userStatusOnline', expires: tsNow(true) + serverTimeOffset + 60};
+      $rootScope.$broadcast('user_update', id);
+    }
+  }
+
   function wrapForFull (id) {
     var user = getUser(id);
 
@@ -311,6 +319,7 @@ angular.module('myApp.services', [])
       case 'updateUserPhoto':
         var userID = update.user_id;
         if (users[userID]) {
+          forceUserOnline(userID);
           safeReplaceObject(users[userID].photo, update.photo);
 
           if (cachedPhotoLocations[userID] !== undefined) {
@@ -336,6 +345,7 @@ angular.module('myApp.services', [])
     saveApiUser: saveApiUser,
     getUser: getUser,
     getUserInput: getUserInput,
+    forceUserOnline: forceUserOnline,
     getUserPhoto: getUserPhoto,
     getUserString: getUserString,
     getUserSearchText: getUserSearchText,
@@ -1998,6 +2008,10 @@ angular.module('myApp.services', [])
             peerID = getMessagePeer(message),
             historyStorage = historiesStorage[peerID];
 
+        if (!message.out) {
+          AppUsersManager.forceUserOnline(message.from_id);
+        }
+
         if (historyStorage !== undefined) {
           var topMsgID = historiesStorage[peerID].history[0];
           if (historiesStorage[peerID].history.indexOf(message.id) != -1) {
@@ -2058,9 +2072,8 @@ angular.module('myApp.services', [])
         $rootScope.$broadcast('dialogs_update', dialog);
 
 
-        if ((Config.Navigator.mobile && $rootScope.selectedPeerID != peerID || $rootScope.idle.isIDLE) &&
-            !message.out &&
-            message.unread) {
+        if (($rootScope.idle.isIDLE || Config.Mobile && $rootScope.selectedPeerID != peerID) &&
+            !message.out && message.unread) {
           NotificationsManager.getPeerMuted(peerID).then(function (muted) {
             if (!message.unread || muted) {
               return;
@@ -2094,6 +2107,9 @@ angular.module('myApp.services', [])
 
               NotificationsManager.cancel('msg' + messageID);
             }
+            else if (peerID > 0) {
+              AppUsersManager.forceUserOnline(peerID);
+            }
           }
         }