diff --git a/internal/payload/outgoing.go b/internal/payload/outgoing.go
index 6eecf278b..2bf113b72 100644
--- a/internal/payload/outgoing.go
+++ b/internal/payload/outgoing.go
@@ -32,9 +32,10 @@ func Message(ctx context.Context, msg *messagingTypes.Message) *outgoing.Message
 
 	return &outgoing.Message{
 		ID:        msg.ID,
+		Type:      string(msg.Type),
 		ChannelID: Uint64toa(msg.ChannelID),
 		Message:   msg.Message,
-		Type:      string(msg.Type),
+		UserID:    msg.UserID,
 
 		ReplyTo:     msg.ReplyTo,
 		Replies:     msg.Replies,
diff --git a/internal/payload/outgoing/message.go b/internal/payload/outgoing/message.go
index 8e82b761f..0b0047823 100644
--- a/internal/payload/outgoing/message.go
+++ b/internal/payload/outgoing/message.go
@@ -7,16 +7,16 @@ import (
 
 type (
 	Message struct {
-		ID        uint64 `json:"ID,string"`
+		ID        uint64 `json:"messageID,string"`
 		Type      string `json:"type"`
 		Message   string `json:"message"`
 		ChannelID string `json:"channelID"`
+		UserID    uint64 `json:"userID,string"`
 
 		ReplyTo     uint64   `json:"replyTo,omitempty,string"`
 		Replies     uint     `json:"replies,omitempty"`
 		RepliesFrom []string `json:"repliesFrom,omitempty"`
 
-		User         *User                 `json:"user"`
 		Attachment   *Attachment           `json:"att,omitempty"`
 		Mentions     MessageMentionSet     `json:"mentions,omitempty"`
 		Reactions    MessageReactionSumSet `json:"reactions,omitempty"`