diff --git a/ChatKit/Class/Model/LCCKMessage.h b/ChatKit/Class/Model/LCCKMessage.h
index b1ff1c3e..347755f9 100644
--- a/ChatKit/Class/Model/LCCKMessage.h
+++ b/ChatKit/Class/Model/LCCKMessage.h
@@ -14,6 +14,8 @@
 
 @interface LCCKMessage : NSObject <NSCoding, NSCopying, LCCKMessageDelegate>
 
+@property (nonatomic, strong) AVIMMessage *message;
+
 @property (nonatomic, copy, readonly) NSString *text;
 @property (nonatomic, copy, readonly) NSString *systemText;
 @property (nonatomic, strong, readwrite) UIImage *photo;
diff --git a/ChatKit/Class/Model/LCCKMessage.m b/ChatKit/Class/Model/LCCKMessage.m
index 3561febd..6c142f7b 100644
--- a/ChatKit/Class/Model/LCCKMessage.m
+++ b/ChatKit/Class/Model/LCCKMessage.m
@@ -364,6 +364,7 @@ + (id)messageWithAVIMTypedMessage:(AVIMTypedMessage *)message {
         lcckMessage.ownerType = LCCKMessageOwnerTypeOther;
     }
     lcckMessage.sendStatus = (LCCKMessageSendState)message.status;
+    lcckMessage.message = message;
 
     return lcckMessage;
 }
diff --git a/ChatKit/Class/Module/Conversation/Model/LCCKConversationViewModel.m b/ChatKit/Class/Module/Conversation/Model/LCCKConversationViewModel.m
index ff601bdd..c74ad3d1 100644
--- a/ChatKit/Class/Module/Conversation/Model/LCCKConversationViewModel.m
+++ b/ChatKit/Class/Module/Conversation/Model/LCCKConversationViewModel.m
@@ -483,6 +483,7 @@ - (void)sendMessage:(id)aMessage
         message.sender = sender;
         message.ownerType = LCCKMessageOwnerTypeSelf;
         avimTypedMessage = [AVIMTypedMessage lcck_messageWithLCCKMessage:message];
+        message.message = avimTypedMessage;
     } else {
         avimTypedMessage = aMessage;
     }