diff --git a/gateway/xmpp.go b/gateway/xmpp.go
index 9864181..798a068 100644
--- a/gateway/xmpp.go
+++ b/gateway/xmpp.go
@@ -127,8 +127,8 @@ func (g *GatewayInfo) ReceivedXMPP_Message(message *xmpp.Message) {
 	} else if message.Gone != nil {
 		g.SendSteamMessageLeaveConversation(steamID)
 	} else {
-		if message.Body != "" {
-			g.SendSteamMessage(steamID, message.Body)
+		if message.Body != nil && len(message.Body) != 0 {
+			g.SendSteamMessage(steamID, message.Body[0].Value)
 		}
 	}
 }
@@ -338,7 +338,9 @@ func (g *GatewayInfo) chatstatesNotification() {
 
 func (g *GatewayInfo) sendXmppMessage(from, subject, message string, chatState interface{}) {
 	if from != XmppJidComponent || from == XmppJidComponent && g.DebugMessage {
-		m := xmpp.Message{To: g.XMPP_JID_Client, From: from, Body: message, Type: "chat"}
+		m := xmpp.Message{To: g.XMPP_JID_Client, From: from, Type: "chat"}
+		mBody := xmpp.MessageBody{Value: message}
+		m.Body = append(m.Body, mBody)
 
 		if subject != "" {
 			m.Subject = subject
diff --git a/xmpp/xmpp.go b/xmpp/xmpp.go
index 3195469..fb46d13 100644
--- a/xmpp/xmpp.go
+++ b/xmpp/xmpp.go
@@ -257,7 +257,9 @@ func SendPresence(status, tpye, from, to, message, nick string) {
 }
 
 func SendMessage(to, subject, message string) {
-	m := xmpp.Message{From: jid.Domain, To: to, Body: message, Type: "chat"}
+	m := xmpp.Message{From: jid.Domain, To: to, Type: "chat"}
+	mBody := xmpp.MessageBody{Value: message}
+	m.Body = append(m.Body, mBody)
 
 	if subject != "" {
 		m.Subject = subject