diff --git a/telethon/client/messages.py b/telethon/client/messages.py
index a4d70c47..aa46035a 100644
--- a/telethon/client/messages.py
+++ b/telethon/client/messages.py
@@ -518,7 +518,8 @@ class MessageMethods(UploadMethods, ButtonMethods, MessageParseMethods):
                 date=result.date,
                 out=result.out,
                 media=result.media,
-                entities=result.entities
+                entities=result.entities,
+                reply_markup=request.reply_markup
             )
             message._finish_init(self, {}, entity)
             return message
diff --git a/telethon/tl/custom/message.py b/telethon/tl/custom/message.py
index 7a632ba2..0fc25a9c 100644
--- a/telethon/tl/custom/message.py
+++ b/telethon/tl/custom/message.py
@@ -648,7 +648,7 @@ class Message(ChatGetter, SenderGetter, TLObject, abc.ABC):
             kwargs['link_preview'] = bool(self.web_preview)
 
         if 'buttons' not in kwargs:
-            kwargs['buttons'] = self.buttons
+            kwargs['buttons'] = self.reply_markup
 
         return await self._client.edit_message(
             await self.get_input_chat(), self.id,