diff --git a/services/mailer/mail.go b/services/mailer/mail.go
index b04925881d..1f0d3278b6 100644
--- a/services/mailer/mail.go
+++ b/services/mailer/mail.go
@@ -403,7 +403,7 @@ func generateAdditionalHeaders(ctx *mailCommentContext, reason string, recipient
 		// https://datatracker.ietf.org/doc/html/rfc2369
 		"List-Archive": fmt.Sprintf("<%s>", repo.HTMLURL()),
 
-		"X-Mailer":                  "Gitea",
+		"X-Mailer":                  "Forgejo",
 		"X-Gitea-Reason":            reason,
 		"X-Gitea-Sender":            ctx.Doer.Name,
 		"X-Gitea-Recipient":         recipient.Name,
diff --git a/services/mailer/mail_test.go b/services/mailer/mail_test.go
index ed972dbb99..bc5d2a1332 100644
--- a/services/mailer/mail_test.go
+++ b/services/mailer/mail_test.go
@@ -360,6 +360,7 @@ func TestGenerateAdditionalHeaders(t *testing.T) {
 	expected := map[string]string{
 		"List-ID":                   "user2/repo1 <repo1.user2.localhost>",
 		"List-Archive":              "<https://try.gitea.io/user2/repo1>",
+		"X-Mailer":                  "Forgejo",
 		"X-Gitea-Reason":            "dummy-reason",
 		"X-Gitea-Sender":            "user2",
 		"X-Gitea-Recipient":         "test",