diff --git a/pyrogram/client/methods/messages/edit_message_media.py b/pyrogram/client/methods/messages/edit_message_media.py
new file mode 100644
index 00000000..56295749
--- /dev/null
+++ b/pyrogram/client/methods/messages/edit_message_media.py
@@ -0,0 +1,36 @@
+# Pyrogram - Telegram MTProto API Client Library for Python
+# Copyright (C) 2017-2018 Dan Tès <https://github.com/delivrance>
+#
+# This file is part of Pyrogram.
+#
+# Pyrogram is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Pyrogram is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with Pyrogram.  If not, see <http://www.gnu.org/licenses/>.
+
+from pyrogram.api import functions
+from pyrogram.client.ext import BaseClient
+
+
+class EditMessageMedia(BaseClient):
+    def edit_message_media(self,
+                           chat_id: int or str,
+                           message_id: int,
+                           media,
+                           reply_markup=None):
+        r = self.send(
+            functions.messages.EditMessage(
+                peer=self.resolve_peer(chat_id),
+                id=message_id,
+                reply_markup=reply_markup.write() if reply_markup else None,
+                media=media
+            )
+        )