From e3dea80cb70fd379a4e3df54b00b755331129c33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=98=AD?= <81747598+lan-yonghui@users.noreply.github.com>
Date: Mon, 29 Dec 2025 17:37:35 +0800
Subject: [PATCH] fix: Fix the issue of garbled Chinese characters in recipient
 names and email titles in email alerts (#11516)

#11264
---
 agent/utils/email/smtp_sender.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/agent/utils/email/smtp_sender.go b/agent/utils/email/smtp_sender.go
index 6d9576a26..3c23b0090 100644
--- a/agent/utils/email/smtp_sender.go
+++ b/agent/utils/email/smtp_sender.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"crypto/tls"
 	"fmt"
+	"mime"
 	"net"
 	"net/http"
 	"net/smtp"
@@ -119,9 +120,11 @@ func parseRecipients(recipient string) []string {
 
 func buildMessage(config SMTPConfig, message EmailMessage, toList []string) (string, error) {
 	headers := make(map[string]string)
-	headers["From"] = config.From
+	encodedFrom := mime.BEncoding.Encode("UTF-8", config.From)
+	headers["From"] = encodedFrom
+	encodedSubject := mime.BEncoding.Encode("UTF-8", message.Subject)
+	headers["Subject"] = encodedSubject
 	headers["To"] = strings.Join(toList, ",")
-	headers["Subject"] = message.Subject
 	headers["Date"] = time.Now().UTC().Format(time.RFC1123Z)
 
 	if message.IsHTML {