diff --git a/telegram/utils.go b/telegram/utils.go
index 8f27279..8ec51c4 100644
--- a/telegram/utils.go
+++ b/telegram/utils.go
@@ -2056,7 +2056,11 @@ func (c *Client) ProcessOutgoingMessage(chatID int64, text string, returnJid str
 
 func (c *Client) returnMessage(returnJid string, chatID int64, text string, code int, isGroupchat bool) {
 	if isGroupchat {
-		gateway.SendErrorMessage(returnJid, gateway.MUCJID(chatID), text, code, isGroupchat, c.xmpp)
+		if code != 0 {
+			gateway.SendErrorMessage(returnJid, gateway.MUCJID(chatID), text, code, isGroupchat, c.xmpp)
+		} else {
+			gateway.SendTextMessage(returnJid, gateway.MUCJID(chatID), text, c.xmpp, isGroupchat)
+		}
 	} else {
 		gateway.SendTextMessage(returnJid, gateway.CHATNODE(chatID), text, c.xmpp, isGroupchat)
 	}