diff --git a/.env b/.env
index 91fbde35..57d6c39f 100644
--- a/.env
+++ b/.env
@@ -1,5 +1,5 @@
 API_ID=1025907
 API_HASH=452b0359b988148995f22ff0f4229750
 VERSION=0.9.1
-VERSION_FULL=0.9.1 (17)
-BUILD=17
+VERSION_FULL=0.9.1 (18)
+BUILD=18
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f22c56e2..61f6a52c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-### 0.9.1 (17)
+### 0.9.1 (18)
 * Added group members online counter.
 * Added description of pinned message in its service notification.
 * Improved profile avatar loading.
diff --git a/src/lib/appManagers/appMessagesManager.ts b/src/lib/appManagers/appMessagesManager.ts
index a54ba040..789c1f71 100644
--- a/src/lib/appManagers/appMessagesManager.ts
+++ b/src/lib/appManagers/appMessagesManager.ts
@@ -2699,7 +2699,8 @@ export class AppMessagesManager {
       }
     };
 
-    if('media' in message) {
+    if((message as Message.message).media) {
+      assumeType<Message.message>(message);
       let usingFullAlbum = true;
       if(message.grouped_id) {
         if(usingMids) {
@@ -2796,8 +2797,8 @@ export class AppMessagesManager {
       } 
     }
 
-    if('action' in message) {
-      const actionWrapped = this.wrapMessageActionTextNew(message, plain);
+    if((message as Message.messageService).action) {
+      const actionWrapped = this.wrapMessageActionTextNew((message as Message.messageService), plain);
       if(actionWrapped) {
         addPart(undefined, actionWrapped);
       }
@@ -5011,7 +5012,8 @@ export class AppMessagesManager {
     }
 
     // set cached url to media
-    if('media' in message) {
+    if((message as Message.message).media) {
+      assumeType<Message.message>(message);
       const {photo: newPhoto, document: newDoc} = message.media as any;
       if(newPhoto) {
         const photo = appPhotosManager.getPhoto('' + tempId);
@@ -5653,7 +5655,7 @@ export class AppMessagesManager {
         referenceDatabase.deleteContext(smth.file_reference, {type: 'message', peerId: message.peerId, messageId: message.mid});
       }
 
-      if('webpage' in media) {
+      if('webpage' in media && media.webpage) {
         const isScheduled = this.getScheduledMessagesStorage(message.peerId) === storage;
         const messageKey = appWebPagesManager.getMessageKeyForPendingWebPage(message.peerId, message.mid, isScheduled);
         appWebPagesManager.deleteWebPageFromPending(media.webpage, messageKey);