diff --git a/broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java b/broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java
index 3c6e5c23..7d2439a0 100755
--- a/broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java
+++ b/broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java
@@ -549,7 +549,7 @@ public class MessagesPublisher {
     }
 
     public void forwardMessage(final WFCMessage.Message message, String forwardUrl) {
-        executorCallback.execute(() -> HttpUtils.httpJsonPost(forwardUrl, new Gson().toJson(SendMessageData.fromProtoMessage(message), SendMessageData.class)));
+        executorCallback.execute(() -> HttpUtils.httpJsonPost(forwardUrl, new Gson().toJson(OutputMessageData.fromProtoMessage(message), OutputMessageData.class)));
     }
 
     public void notifyChannelListenStatusChanged(WFCMessage.ChannelInfo channelInfo, String user, boolean listen) {
diff --git a/common/src/main/java/cn/wildfirechat/pojos/OutputMessageData.java b/common/src/main/java/cn/wildfirechat/pojos/OutputMessageData.java
new file mode 100644
index 00000000..ce742800
--- /dev/null
+++ b/common/src/main/java/cn/wildfirechat/pojos/OutputMessageData.java
@@ -0,0 +1,85 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package cn.wildfirechat.pojos;
+
+import cn.wildfirechat.proto.WFCMessage;
+import io.netty.util.internal.StringUtil;
+
+import java.util.List;
+
+public class OutputMessageData {
+    private long messageId;
+    private String sender;
+    private Conversation conv;
+    private MessagePayload payload;
+    private List<String> toUsers;
+    private long timestamp;
+
+    public String getSender() {
+        return sender;
+    }
+
+    public void setSender(String sender) {
+        this.sender = sender;
+    }
+
+    public Conversation getConv() {
+        return conv;
+    }
+
+    public void setConv(Conversation conv) {
+        this.conv = conv;
+    }
+
+    public MessagePayload getPayload() {
+        return payload;
+    }
+
+    public void setPayload(MessagePayload payload) {
+        this.payload = payload;
+    }
+
+    public List<String> getToUsers() {
+        return toUsers;
+    }
+
+    public void setToUsers(List<String> toUsers) {
+        this.toUsers = toUsers;
+    }
+
+    public long getMessageId() {
+        return messageId;
+    }
+
+    public void setMessageId(long messageId) {
+        this.messageId = messageId;
+    }
+
+    public long getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public static OutputMessageData fromProtoMessage(WFCMessage.Message protoMessage) {
+        OutputMessageData data = new OutputMessageData();
+        data.messageId = protoMessage.getMessageId();
+        data.sender = protoMessage.getFromUser();
+        data.conv = new Conversation();
+        data.conv.setTarget(protoMessage.getConversation().getTarget());
+        data.conv.setType(protoMessage.getConversation().getType());
+        data.conv.setLine(protoMessage.getConversation().getLine());
+        data.payload = MessagePayload.fromProtoMessageContent(protoMessage.getContent());
+        data.timestamp = protoMessage.getServerTimestamp();
+        data.toUsers = protoMessage.getToList();
+        return data;
+    }
+}