diff --git a/telethon/client/messages.py b/telethon/client/messages.py
index 3e6bde79..2882d3e5 100644
--- a/telethon/client/messages.py
+++ b/telethon/client/messages.py
@@ -725,7 +725,7 @@ class MessageMethods:
                     silent=silent,
                     reply_to=reply_to,
                     buttons=markup,
-                    entities=message.entities,
+                    formatting_entities=message.entities,
                     schedule=schedule
                 )
 
diff --git a/telethon/client/uploads.py b/telethon/client/uploads.py
index 90476357..f3b787fa 100644
--- a/telethon/client/uploads.py
+++ b/telethon/client/uploads.py
@@ -359,12 +359,8 @@ class UploadMethods:
         entity = await self.get_input_entity(entity)
         reply_to = utils.get_message_id(reply_to)
 
-        # Not document since it's subject to change.
-        # Needed when a Message is passed to send_message and it has media.
         if formatting_entities is not None:
             msg_entities = formatting_entities
-        elif 'entities' in kwargs:
-            msg_entities = kwargs['entities']
         else:
             caption, msg_entities =\
                 await self._parse_message_text(caption, parse_mode)