diff --git a/packages/client/src/types/messages/message.ts b/packages/client/src/types/messages/message.ts
index 607f41b2..0b3cab07 100644
--- a/packages/client/src/types/messages/message.ts
+++ b/packages/client/src/types/messages/message.ts
@@ -11,6 +11,7 @@ import { assertTypeIsNot } from '@mtcute/core/utils.js'
 import { makeInspectable } from '../../utils/index.js'
 import { memoizeGetters } from '../../utils/memoize.js'
 import { BotKeyboard, ReplyMarkup } from '../bots/keyboards.js'
+import { TextWithEntities } from '../misc/index.js'
 import { Chat } from '../peers/chat.js'
 import { PeersIndex } from '../peers/peers-index.js'
 import { User } from '../peers/user.js'
@@ -257,6 +258,15 @@ export class Message {
         return entities
     }
 
+    get textWithEntities(): TextWithEntities {
+        if (this.raw._ === 'messageService') return { text: '', entities: [] }
+
+        return {
+            text: this.raw.message,
+            entities: this.raw.entities,
+        }
+    }
+
     /**
      * Message action. `null` for non-service messages
      * or for unsupported events.