diff --git a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
index 34ccbf06..d5ced6d1 100755
--- a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
+++ b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
@@ -319,9 +319,6 @@ public class MemoryMessagesStore implements IMessagesStore {
                 long targetMessageId = entry.getValue();
 
                 MessageBundle bundle = mIMap.get(targetMessageId);
-                if (bundle == null) {
-                    bundle = databaseStore.getMessage(targetMessageId);
-                }
 
                 if (bundle != null) {
                     if (exceptClientId == null || !exceptClientId.equals(bundle.getFromClientId()) || !user.equals(bundle.getFromUser())) {
@@ -411,10 +408,6 @@ public class MemoryMessagesStore implements IMessagesStore {
                 long targetMessageId = entry.getValue();
 
                 MessageBundle bundle = mIMap.get(targetMessageId);
-                if (bundle == null) {
-                    bundle = databaseStore.getMessage(targetMessageId);
-                }
-
                 if (bundle != null) {
                     if (exceptClientId == null || !exceptClientId.equals(bundle.getFromClientId()) || !fromUser.equals(bundle.getFromUser())) {
                         size += bundle.getMessage().getSerializedSize();
@@ -2115,10 +2108,6 @@ public class MemoryMessagesStore implements IMessagesStore {
         MessageBundle bundle = mIMap.get(messageId);
         if (bundle != null) {
             return bundle.getMessage();
-        } else {
-            bundle = databaseStore.getMessage(messageId);
-            if (bundle != null)
-                return bundle.getMessage();
         }
         return null;
     }
diff --git a/broker/src/main/java/win/liyufan/im/MessageBundle.java b/broker/src/main/java/win/liyufan/im/MessageBundle.java
index dcab3a35..fc962195 100755
--- a/broker/src/main/java/win/liyufan/im/MessageBundle.java
+++ b/broker/src/main/java/win/liyufan/im/MessageBundle.java
@@ -65,6 +65,11 @@ public class MessageBundle implements Serializable {
 	}
 
     public void setMessage(WFCMessage.Message message) {
+        this.fromUser = message.getFromUser();
+        this.type = message.getConversation().getType();
+        this.targetId = message.getConversation().getTarget();
+        this.line = message.getConversation().getLine();
         this.message = message;
+        this.messageId = message.getMessageId();
     }
 }