diff --git a/pyrogram/client/methods/messages/__init__.py b/pyrogram/client/methods/messages/__init__.py
index a1d3506c..c2ff2400 100644
--- a/pyrogram/client/methods/messages/__init__.py
+++ b/pyrogram/client/methods/messages/__init__.py
@@ -17,17 +17,21 @@
 # along with Pyrogram.  If not, see <http://www.gnu.org/licenses/>.
 
 from .action import Action
+from .forward_messages import ForwardMessages
+from .get_history import GetHistory
 from .get_messages import GetMessages
 from .media import Media
-from .text import Text
+from .send_message import SendMessage
 from .update import Update
 
 
 class Messages(
+    GetHistory,
     GetMessages,
     Action,
     Media,
     Update,
-    Text
+    ForwardMessages,
+    SendMessage
 ):
     pass
diff --git a/pyrogram/client/methods/messages/text/forward_messages.py b/pyrogram/client/methods/messages/forward_messages.py
similarity index 100%
rename from pyrogram/client/methods/messages/text/forward_messages.py
rename to pyrogram/client/methods/messages/forward_messages.py
diff --git a/pyrogram/client/methods/messages/text/send_message.py b/pyrogram/client/methods/messages/send_message.py
similarity index 100%
rename from pyrogram/client/methods/messages/text/send_message.py
rename to pyrogram/client/methods/messages/send_message.py
diff --git a/pyrogram/client/methods/messages/text/__init__.py b/pyrogram/client/methods/messages/text/__init__.py
deleted file mode 100644
index 3fcf89ca..00000000
--- a/pyrogram/client/methods/messages/text/__init__.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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 .forward_messages import ForwardMessages
-from .send_message import SendMessage
-
-
-class Text(
-    ForwardMessages,
-    SendMessage
-):
-    pass