diff --git a/app/js/messages_manager.js b/app/js/messages_manager.js
index 09badfe6..6358b6f8 100644
--- a/app/js/messages_manager.js
+++ b/app/js/messages_manager.js
@@ -908,10 +908,14 @@ angular.module('myApp.services')
       var message = messagesStorage[messageID]
       if (!message ||
           !message.canBeEdited ||
-          !message.pFlags.out ||
           message.date < tsNow(true) - 2 * 86400) {
         return false
       }
+      var peerID = getMessagePeer(message)
+      if (!message.pFlags.out &&
+          message.peerID != AppUsersManager.getSelf().id) {
+        return false
+      }
 
       return true
     }