diff --git a/engine.pro b/engine.pro
index 2e76b8ecb90bcae57badcc66613e12639b7cbdb9..11f2c172ddffce6cf045d2d509cbc62c6acaf0a6 100644
--- a/engine.pro
+++ b/engine.pro
@@ -100,7 +100,8 @@ SOURCES +=  api/meteorddp.cpp \
     ddpRequests/rocketchatgetroombyid.cpp \
     ddpRequests/rocketchatjoinroomrequest.cpp \
     ddpRequests/rocketchatgetroomidbynameorid.cpp \
-    ddpRequests/rocketchatspotlightrequest.cpp
+    ddpRequests/rocketchatspotlightrequest.cpp \
+    repos/entities/rocketchatreplymessage.cpp
 
 
 HEADERS += \
@@ -203,7 +204,8 @@ HEADERS += \
     ddpRequests/rocketchatjoinroomrequest.h \
     ddpRequests/rocketchatgetroomidbynameorid.h \
     ddpRequests/rocketchatspotlightrequest.h \
-    api/messagelistener.h
+    api/messagelistener.h \
+    repos/entities/rocketchatreplymessage.h
 
 linux{
 
diff --git a/repos/entities/rocketchatmessage.h b/repos/entities/rocketchatmessage.h
index 43e1940060c772ba190968a43b703d141b0e7404..f80b396c5a014f8ed352e2208dbe31f47c10d245 100755
--- a/repos/entities/rocketchatmessage.h
+++ b/repos/entities/rocketchatmessage.h
@@ -36,7 +36,8 @@ class RocketChatMessage
 {
     public:
         enum class Type {
-            textmessage
+            textmessage,
+            replymessage
         };
         RocketChatMessage( QJsonObject data, unsigned long timestamp, RocketChatMessage::Type messageType = Type::textmessage );
         RocketChatMessage( QJsonObject data );
diff --git a/repos/entities/rocketchatreplymessage.cpp b/repos/entities/rocketchatreplymessage.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..f295b6a4d104fdd9377b476412dc18276e4f1559
--- /dev/null
+++ b/repos/entities/rocketchatreplymessage.cpp
@@ -0,0 +1,9 @@
+#include "rocketchatreplymessage.h"
+
+
+RocketChatReplyMessage::RocketChatReplyMessage(QString pText, QString pUrl)
+    :RocketChatAttachment(pUrl,"replyMessage",pUrl),RocketChatMessage(QJsonObject(),0,RocketChatMessage::Type::replymessage)
+{
+    mUrl = pUrl;
+    messageString = pText;
+}
diff --git a/repos/entities/rocketchatreplymessage.h b/repos/entities/rocketchatreplymessage.h
new file mode 100644
index 0000000000000000000000000000000000000000..18975aad27b4a2f7f56fa72aa841cea0eae9d196
--- /dev/null
+++ b/repos/entities/rocketchatreplymessage.h
@@ -0,0 +1,22 @@
+#ifndef ROCKETCHATREPLYMESSAGE_H
+#define ROCKETCHATREPLYMESSAGE_H
+
+#include "rocketchatattachment.h"
+#include "rocketchatmessage.h"
+
+#include <QObject>
+
+class RocketChatReplyMessage :  RocketChatAttachment, RocketChatMessage
+{
+    Q_OBJECT
+public:
+    RocketChatReplyMessage( QString Text, QString Url = "");
+    using RocketChatAttachment::getType;
+    using RocketChatMessage::getMessageString;
+
+signals:
+
+public slots:
+};
+
+#endif // ROCKETCHATREPLYMESSAGE_H
diff --git a/services/messageservice.cpp b/services/messageservice.cpp
index 510e3606af9bdaa0283f4fe2c8b3ce8b925bbae2..524d187088a58dae51e66e0abed705c35f341be2 100644
--- a/services/messageservice.cpp
+++ b/services/messageservice.cpp
@@ -164,7 +164,6 @@ QSharedPointer<RocketChatMessage> MessageService::parseMessage( const QJsonObjec
         if ( authorId == userId ) {
             ownMessage = true;
         }
-
         QJsonObject timestampObject = pMessageData[QStringLiteral( "ts" )].toObject();
         qint64 timestamp = 0;