diff --git a/cmd/conversation.go b/cmd/conversation.go
index 7ea35d28..6824205e 100644
--- a/cmd/conversation.go
+++ b/cmd/conversation.go
@@ -736,7 +736,7 @@ func handleCreateConversation(r *fastglue.Request) error {
 	}
 
 	// Send reply to the created conversation.
-	if err := app.conversation.SendReply(media, req.InboxID, auser.ID, contact.ID, conversationUUID, req.Content, to, nil /**cc**/, nil /**bcc**/, map[string]any{} /**meta**/); err != nil {
+	if _, err := app.conversation.SendReply(media, req.InboxID, auser.ID, contact.ID, conversationUUID, req.Content, to, nil /**cc**/, nil /**bcc**/, map[string]any{} /**meta**/); err != nil {
 		// Delete the conversation if reply fails.
 		if err := app.conversation.DeleteConversation(conversationUUID); err != nil {
 			app.lo.Error("error deleting conversation", "error", err)
diff --git a/cmd/messages.go b/cmd/messages.go
index 48f25160..47e04bc0 100644
--- a/cmd/messages.go
+++ b/cmd/messages.go
@@ -175,13 +175,15 @@ func handleSendMessage(r *fastglue.Request) error {
 	}
 
 	if req.Private {
-		if message, err := app.conversation.SendPrivateNote(media, user.ID, cuuid, req.Message); err != nil {
+		message, err := app.conversation.SendPrivateNote(media, user.ID, cuuid, req.Message)
+		if err != nil {
 			return sendErrorEnvelope(r, err)
 		}
 		return r.SendEnvelope(message)
 	}
 
-	if message, err := app.conversation.SendReply(media, conv.InboxID, user.ID, conv.ContactID, cuuid, req.Message, req.To, req.CC, req.BCC, map[string]any{} /**meta**/); err != nil {
+	message, err := app.conversation.SendReply(media, conv.InboxID, user.ID, conv.ContactID, cuuid, req.Message, req.To, req.CC, req.BCC, map[string]any{} /**meta**/)
+	if err != nil {
 		return sendErrorEnvelope(r, err)
 	}
 	return r.SendEnvelope(message)
diff --git a/internal/conversation/conversation.go b/internal/conversation/conversation.go
index f4418a8f..97030daf 100644
--- a/internal/conversation/conversation.go
+++ b/internal/conversation/conversation.go
@@ -1077,7 +1077,7 @@ func (m *Manager) SendCSATReply(actorUserID int, conversation models.Conversatio
 	}
 
 	// Send CSAT reply.
-	_, err = m.SendReply(nil /**media**/, conversation.InboxID, actorUserID, conversation.UUID, message, to, cc, bcc, meta)
+	_, err = m.SendReply(nil /**media**/, conversation.InboxID, actorUserID, conversation.ContactID, conversation.UUID, message, to, cc, bcc, meta)
 	if err != nil {
 		m.lo.Error("error sending CSAT reply", "conversation_uuid", conversation.UUID, "error", err)
 		return envelope.NewError(envelope.GeneralError, m.i18n.Ts("globals.messages.errorCreating", "name", "{globals.terms.csat}"), nil)