diff --git a/pyrogram/client/client.py b/pyrogram/client/client.py
index ebb87dd3..9afd7b53 100644
--- a/pyrogram/client/client.py
+++ b/pyrogram/client/client.py
@@ -712,37 +712,9 @@ class Client:
                     message = update.message
 
                     if isinstance(message, types.Message):
-                        m = utils.parse_message(message, users, chats)
-
-                        if message.reply_to_msg_id:
-                            rm = self.get_messages(m.chat.id, [message.reply_to_msg_id])
-
-                            message = rm.messages[0]
-
-                            if isinstance(message, types.Message):
-                                m.reply_to_message = utils.parse_message(
-                                    message,
-                                    {i.id: i for i in rm.users},
-                                    {i.id: i for i in rm.chats}
-                                )
-                            else:
-                                continue
+                        m = utils.parse_message(self, message, users, chats)
                     elif isinstance(message, types.MessageService):
-                        m = utils.parse_message_service(message, users, chats)
-
-                        if isinstance(message.action, types.MessageActionPinMessage):
-                            pm = self.get_messages(m.chat.id, [message.reply_to_msg_id])
-
-                            message = pm.messages[0]
-
-                            if isinstance(message, types.Message):
-                                m.pinned_message = utils.parse_message(
-                                    message,
-                                    {i.id: i for i in pm.users},
-                                    {i.id: i for i in pm.chats}
-                                )
-                            else:
-                                continue
+                        m = utils.parse_message_service(self, message, users, chats)
                     else:
                         continue
                 else:
diff --git a/pyrogram/client/utils.py b/pyrogram/client/utils.py
index 68af6b84..5fe04ee5 100644
--- a/pyrogram/client/utils.py
+++ b/pyrogram/client/utils.py
@@ -114,7 +114,13 @@ def parse_thumb(thumb: types.PhotoSize or types.PhotoCachedSize) -> pyrogram.Pho
 
 
 # TODO: Reorganize code, maybe split parts as well
-def parse_message(message: types.Message, users: dict, chats: dict) -> pyrogram.Message:
+def parse_message(
+        client,
+        message: types.Message,
+        users: dict,
+        chats: dict,
+        replies: int = 1
+) -> pyrogram.Message:
     entities = parse_entities(message.entities)
 
     forward_from = None
@@ -339,7 +345,7 @@ def parse_message(message: types.Message, users: dict, chats: dict) -> pyrogram.
                         file_size=doc.size
                     )
 
-    return pyrogram.Message(
+    m = pyrogram.Message(
         message_id=message.id,
         date=message.date,
         chat=parse_chat(message, users, chats),
@@ -367,8 +373,27 @@ def parse_message(message: types.Message, users: dict, chats: dict) -> pyrogram.
         document=document
     )
 
+    if message.reply_to_msg_id and replies:
+        reply_to_message = client.get_messages(m.chat.id, [message.reply_to_msg_id])
 
-def parse_message_service(message: types.MessageService, users: dict, chats: dict) -> pyrogram.Message:
+        message = reply_to_message.messages[0]
+        users = {i.id: i for i in reply_to_message.users}
+        chats = {i.id: i for i in reply_to_message.chats}
+
+        if isinstance(message, types.Message):
+            m.reply_to_message = parse_message(client, message, users, chats, replies - 1)
+        elif isinstance(message, types.MessageService):
+            m.reply_to_message = parse_message_service(client, message, users, chats)
+
+    return m
+
+
+def parse_message_service(
+        client,
+        message: types.MessageService,
+        users: dict,
+        chats: dict
+) -> pyrogram.Message:
     action = message.action
 
     new_chat_members = None
@@ -396,7 +421,7 @@ def parse_message_service(message: types.MessageService, users: dict, chats: dic
     elif isinstance(action, types.MessageActionChatCreate):
         group_chat_created = True
 
-    return pyrogram.Message(
+    m = pyrogram.Message(
         message_id=message.id,
         date=message.date,
         chat=parse_chat(message, users, chats),
@@ -413,6 +438,21 @@ def parse_message_service(message: types.MessageService, users: dict, chats: dic
         # TODO: channel_chat_created
     )
 
+    if isinstance(action, types.MessageActionPinMessage):
+        pin_message = client.get_messages(m.chat.id, [message.reply_to_msg_id])
+
+        message = pin_message.messages[0]
+        users = {i.id: i for i in pin_message.users}
+        chats = {i.id: i for i in pin_message.chats}
+
+        if isinstance(message, types.Message):
+            m.pinned_message = parse_message(client, message, users, chats)
+        elif isinstance(message, types.MessageService):
+            # TODO: We can't pin a service message, can we?
+            m.pinned_message = parse_message_service(client, message, users, chats)
+
+    return m
+
 
 def decode(s: str) -> bytes:
     s = b64decode(s + "=" * (-len(s) % 4), "-_")