From 53970ec4eda50970507d570a52d5edd014243300 Mon Sep 17 00:00:00 2001
From: NorthRealm <155140859+NorthRealm@users.noreply.github.com>
Date: Tue, 8 Jul 2025 14:09:38 +0800
Subject: [PATCH] Refactor

---
 services/mailer/mail.go              | 10 ++++++----
 services/mailer/mail_issue_common.go |  2 --
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/services/mailer/mail.go b/services/mailer/mail.go
index a0ead7c9eb..d673fad80f 100644
--- a/services/mailer/mail.go
+++ b/services/mailer/mail.go
@@ -193,10 +193,12 @@ func generateMetadataHeaders(repo *repo_model.Repository) map[string]string {
 
 func generateSenderRecipientHeaders(doer, recipient *user_model.User) map[string]string {
 	return map[string]string{
-		"X-Gitea-Sender":     doer.Name,
-		"X-Gitea-Recipient":  recipient.Name,
-		"X-GitHub-Sender":    doer.Name,
-		"X-GitHub-Recipient": recipient.Name,
+		"X-Gitea-Sender":             doer.Name,
+		"X-Gitea-Recipient":          recipient.Name,
+		"X-Gitea-Recipient-Address":  recipient.Email,
+		"X-GitHub-Sender":            doer.Name,
+		"X-GitHub-Recipient":         recipient.Name,
+		"X-GitHub-Recipient-Address": recipient.Email,
 	}
 }
 
diff --git a/services/mailer/mail_issue_common.go b/services/mailer/mail_issue_common.go
index 45ec7609b7..32a85b690e 100644
--- a/services/mailer/mail_issue_common.go
+++ b/services/mailer/mail_issue_common.go
@@ -312,10 +312,8 @@ func generateAdditionalHeadersForIssue(ctx *mailComment, reason string, recipien
 	maps.Copy(headers, generateSenderRecipientHeaders(ctx.Doer, recipient))
 	maps.Copy(headers, generateReasonHeaders(reason))
 
-	headers["X-Gitea-Recipient-Address"] = recipient.Email
 	headers["X-Gitea-Issue-ID"] = issueID
 	headers["X-Gitea-Issue-Link"] = ctx.Issue.HTMLURL()
-	headers["X-GitHub-Recipient-Address"] = recipient.Email
 	headers["X-GitLab-Issue-IID"] = issueID
 
 	return headers