From 86bb2538bb299ce06d87644900ef9e2c73563f4b Mon Sep 17 00:00:00 2001
From: KenanZhu <3471685733@qq.com>
Date: Wed, 3 Jun 2026 20:18:40 +0800
Subject: [PATCH] fix(templates): cross-validate against official Gitea mail
 templates

- Fix INK theme: replace .ActiveCodeLives with correct field, remove from non-auth contexts (8 files)
- Fix hardcoded button text: use locale key mail.view_it_on in ember, heritage, ink, mono, terminal, terra (30+ files)
- Add missing {{if .CanReply}}mail.reply{{end}} block to all 10 themes default.tmpl
- Add missing mail.release.note locale label to all 10 themes release.tmpl
- Add missing mail.team_invite.text_3 to ink and terra team_invite.tmpl
- Add missing blockquote CSS to aurora, ink, mono, neon, terra default.tmpl

Verified: all 110 templates compile successfully with Go build-preview.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 themes/aurora/mail/repo/issue/default.tmpl          |  5 +++--
 themes/aurora/mail/repo/release.tmpl                | 10 +++++-----
 themes/bloom/mail/repo/issue/default.tmpl           |  3 ++-
 themes/bloom/mail/repo/release.tmpl                 |  1 +
 themes/ember/mail/repo/actions/workflow_run.tmpl    |  2 +-
 themes/ember/mail/repo/collaborator.tmpl            |  2 +-
 themes/ember/mail/repo/issue/assigned.tmpl          |  2 +-
 themes/ember/mail/repo/issue/default.tmpl           |  4 ++--
 themes/ember/mail/repo/release.tmpl                 |  3 ++-
 themes/ember/mail/repo/transfer.tmpl                |  2 +-
 themes/heritage/mail/repo/actions/workflow_run.tmpl |  2 +-
 themes/heritage/mail/repo/collaborator.tmpl         |  2 +-
 themes/heritage/mail/repo/issue/assigned.tmpl       |  2 +-
 themes/heritage/mail/repo/issue/default.tmpl        |  4 ++--
 themes/heritage/mail/repo/release.tmpl              |  3 ++-
 themes/heritage/mail/repo/transfer.tmpl             |  2 +-
 themes/horizon/mail/repo/issue/default.tmpl         |  5 +++--
 themes/horizon/mail/repo/release.tmpl               |  3 ++-
 themes/ink/mail/org/team_invite.tmpl                |  4 ++--
 themes/ink/mail/repo/actions/workflow_run.tmpl      |  3 +--
 themes/ink/mail/repo/collaborator.tmpl              |  3 +--
 themes/ink/mail/repo/issue/assigned.tmpl            |  3 +--
 themes/ink/mail/repo/issue/default.tmpl             |  6 +++---
 themes/ink/mail/repo/release.tmpl                   |  6 +++---
 themes/ink/mail/repo/transfer.tmpl                  |  3 +--
 themes/ink/mail/user/auth/register_notify.tmpl      |  3 +--
 themes/ink/mail/user/auth/reset_passwd.tmpl         |  4 ++--
 themes/mono/mail/repo/actions/workflow_run.tmpl     |  4 ++--
 themes/mono/mail/repo/collaborator.tmpl             |  4 ++--
 themes/mono/mail/repo/issue/assigned.tmpl           |  4 ++--
 themes/mono/mail/repo/issue/default.tmpl            |  5 +++--
 themes/mono/mail/repo/release.tmpl                  |  6 +++---
 themes/mono/mail/repo/transfer.tmpl                 |  4 ++--
 themes/neon/mail/repo/issue/default.tmpl            |  5 +++--
 themes/neon/mail/repo/release.tmpl                  | 10 +++++-----
 themes/terminal/mail/repo/actions/workflow_run.tmpl |  2 +-
 themes/terminal/mail/repo/collaborator.tmpl         |  2 +-
 themes/terminal/mail/repo/issue/assigned.tmpl       |  2 +-
 themes/terminal/mail/repo/issue/default.tmpl        |  4 ++--
 themes/terminal/mail/repo/release.tmpl              |  3 ++-
 themes/terminal/mail/repo/transfer.tmpl             |  2 +-
 themes/terra/mail/org/team_invite.tmpl              |  3 ++-
 themes/terra/mail/repo/actions/workflow_run.tmpl    |  4 ++--
 themes/terra/mail/repo/collaborator.tmpl            |  4 ++--
 themes/terra/mail/repo/issue/assigned.tmpl          |  4 ++--
 themes/terra/mail/repo/issue/default.tmpl           |  4 ++--
 themes/terra/mail/repo/release.tmpl                 |  4 ++--
 themes/terra/mail/repo/transfer.tmpl                |  4 ++--
 48 files changed, 91 insertions(+), 85 deletions(-)

diff --git a/themes/aurora/mail/repo/issue/default.tmpl b/themes/aurora/mail/repo/issue/default.tmpl
index 42c8eb4..132d254 100644
--- a/themes/aurora/mail/repo/issue/default.tmpl
+++ b/themes/aurora/mail/repo/issue/default.tmpl
@@ -7,6 +7,7 @@
   <title>{{.Subject}}</title>
   <style type="text/css">
     body,.ExternalClass,.ReadMsgBody{background-color:#0a0815}
+    blockquote { padding-left: 1em; margin: 1em 0; border-left: 1px solid rgba(139,92,246,0.5); color: rgba(255,255,255,0.6) }
     @media only screen and (max-width:480px){
       .resp-card{padding:32px 20px!important}
       .resp-spacer{padding:24px 20px!important}
@@ -25,13 +26,13 @@
       <!-- card -->
       <tr><td class="resp-card" style="padding:48px 40px;background:rgba(25,20,50,0.8);border:1px solid rgba(13,148,136,0.2);box-shadow:0 0 60px rgba(13,148,136,0.08),0 0 120px rgba(99,102,241,0.04);">
         <p class="resp-heading" style="margin:0 0 20px;font-size:24px;font-weight:300;color:#ccfbf1;line-height:1.3;letter-spacing:-0.5px;"></p>
-        <p style="margin:0 0 24px;font-size:14px;line-height:2;color:rgba(210,252,245,0.88);font-weight:300;">{{if .IsMention}}<p>{{.locale.Tr "mail.issue.x_mentioned_you" .Doer.Name}}</p>{{end}}{{if eq .ActionName "push"}}<p>{{if .Comment.IsForcePush}}{{$oldCommitUrl := printf "%s/commit/%s" .Comment.Issue.PullRequest.BaseRepo.HTMLURL .Comment.OldCommit}}{{$oldShortSha := ShortSha .Comment.OldCommit}}{{$oldCommitLink := HTMLFormat "<a href=\047%[1]s\047>%[2]s</a>" $oldCommitUrl $oldShortSha}}{{$newCommitUrl := printf "%s/commit/%s" .Comment.Issue.PullRequest.BaseRepo.HTMLURL .Comment.NewCommit}}{{$newShortSha := ShortSha .Comment.NewCommit}}{{$newCommitLink := HTMLFormat "<a href=\047%[1]s\047>%[2]s</a>" $newCommitUrl $newShortSha}}{{.locale.Tr "mail.issue.action.force_push" .Doer.Name .Comment.Issue.PullRequest.HeadBranch $oldCommitLink $newCommitLink}}{{else}}{{.locale.TrN (len .Comment.Commits) "mail.issue.action.push_1" "mail.issue.action.push_n" .Doer.Name .Comment.Issue.PullRequest.HeadBranch (len .Comment.Commits)}}{{end}}</p>{{end}}<p>{{if eq .ActionName "close"}}{{.locale.Tr "mail.issue.action.close" .Doer.Name .Issue.Index}}{{else if eq .ActionName "reopen"}}{{.locale.Tr "mail.issue.action.reopen" .Doer.Name .Issue.Index}}{{else if eq .ActionName "merge"}}{{.locale.Tr "mail.issue.action.merge" .Doer.Name .Issue.Index .Issue.PullRequest.BaseBranch}}{{else if eq .ActionName "approve"}}{{.locale.Tr "mail.issue.action.approve" .Doer.Name}}{{else if eq .ActionName "reject"}}{{.locale.Tr "mail.issue.action.reject" .Doer.Name}}{{else if eq .ActionName "review"}}{{.locale.Tr "mail.issue.action.review" .Doer.Name}}{{else if eq .ActionName "review_dismissed"}}{{.locale.Tr "mail.issue.action.review_dismissed" .Doer.Name .Comment.Review.Reviewer.Name}}{{else if eq .ActionName "ready_for_review"}}{{.locale.Tr "mail.issue.action.ready_for_review" .Doer.Name}}{{end}}{{- if eq .Body ""}}{{if eq .ActionName "new"}}{{.locale.Tr "mail.issue.action.new" .Doer.Name .Issue.Index}}{{end}}{{else}}{{.Body}}{{end -}}</p>{{- range .ReviewComments}}<hr><p>{{$.locale.Tr "mail.issue.in_tree_path" .TreePath}}</p><pre>{{.Patch}}</pre><div>{{.RenderedContent}}</div>{{end -}}{{if eq .ActionName "push"}}<ul>{{range .Comment.Commits}}<li><a href="{{$.Comment.Issue.PullRequest.BaseRepo.HTMLURL}}/commit/{{.ID}}">{{ShortSha .ID.String}}</a> - {{.MessageTitle}}</li>{{end}}</ul>{{end}}</p>
+        <p style="margin:0 0 24px;font-size:14px;line-height:2;color:rgba(210,252,245,0.88);font-weight:300;">{{if .IsMention}}<p>{{.locale.Tr "mail.issue.x_mentioned_you" .Doer.Name}}</p>{{end}}{{if eq .ActionName "push"}}<p>{{if .Comment.IsForcePush}}{{$oldCommitUrl := printf "%s/commit/%s" .Comment.Issue.PullRequest.BaseRepo.HTMLURL .Comment.OldCommit}}{{$oldShortSha := ShortSha .Comment.OldCommit}}{{$oldCommitLink := HTMLFormat "<a href=\047%[1]s\047>%[2]s</a>" $oldCommitUrl $oldShortSha}}{{$newCommitUrl := printf "%s/commit/%s" .Comment.Issue.PullRequest.BaseRepo.HTMLURL .Comment.NewCommit}}{{$newShortSha := ShortSha .Comment.NewCommit}}{{$newCommitLink := HTMLFormat "<a href=\047%[1]s\047>%[2]s</a>" $newCommitUrl $newShortSha}}{{.locale.Tr "mail.issue.action.force_push" .Doer.Name .Comment.Issue.PullRequest.HeadBranch $oldCommitLink $newCommitLink}}{{else}}{{.locale.TrN (len .Comment.Commits) "mail.issue.action.push_1" "mail.issue.action.push_n" .Doer.Name .Comment.Issue.PullRequest.HeadBranch (len .Comment.Commits)}}{{end}}</p>{{end}}<p>{{if eq .ActionName "close"}}{{.locale.Tr "mail.issue.action.close" .Doer.Name .Issue.Index}}{{else if eq .ActionName "reopen"}}{{.locale.Tr "mail.issue.action.reopen" .Doer.Name .Issue.Index}}{{else if eq .ActionName "merge"}}{{.locale.Tr "mail.issue.action.merge" .Doer.Name .Issue.Index .Issue.PullRequest.BaseBranch}}{{else if eq .ActionName "approve"}}{{.locale.Tr "mail.issue.action.approve" .Doer.Name}}{{else if eq .ActionName "reject"}}{{.locale.Tr "mail.issue.action.reject" .Doer.Name}}{{else if eq .ActionName "review"}}{{.locale.Tr "mail.issue.action.review" .Doer.Name}}{{else if eq .ActionName "review_dismissed"}}{{.locale.Tr "mail.issue.action.review_dismissed" .Doer.Name .Comment.Review.Reviewer.Name}}{{else if eq .ActionName "ready_for_review"}}{{.locale.Tr "mail.issue.action.ready_for_review" .Doer.Name}}{{end}}{{- if eq .Body ""}}{{if eq .ActionName "new"}}{{.locale.Tr "mail.issue.action.new" .Doer.Name .Issue.Index}}{{end}}{{else}}{{.Body}}{{end -}}{{if .CanReply}}&nbsp;{{.locale.Tr "mail.reply"}}{{end}}</p>{{- range .ReviewComments}}<hr><p>{{$.locale.Tr "mail.issue.in_tree_path" .TreePath}}</p><pre>{{.Patch}}</pre><div>{{.RenderedContent}}</div>{{end -}}{{if eq .ActionName "push"}}<ul>{{range .Comment.Commits}}<li><a href="{{$.Comment.Issue.PullRequest.BaseRepo.HTMLURL}}/commit/{{.ID}}">{{ShortSha .ID.String}}</a> - {{.MessageTitle}}</li>{{end}}</ul>{{end}}</p>
         <p style="margin:0;font-size:13px;line-height:1.8;color:rgba(180,195,215,0.95);font-weight:300;"></p>
       </td></tr>
       <tr><td style="height:1px;background:linear-gradient(90deg,transparent,rgba(13,148,136,0.3),transparent);"></td></tr>
       <!-- button + link -->
       <tr><td class="resp-spacer" style="padding:40px 40px;text-align:center;">
-        
+
         <table border="0" cellpadding="0" cellspacing="0" width="100%" style="margin:0 0 32px;"><tr><td align="center">
           <a href="{{.Link}}" style="display:inline-block;padding:16px 48px;font-size:14px;font-weight:400;color:#e0f5f3;text-decoration:none;background:rgba(13,148,136,0.18);border:1px solid rgba(13,148,136,0.3);letter-spacing:1px;">{{.locale.Tr "mail.view_it_on" AppName}}</a>
         </td></tr></table>
diff --git a/themes/aurora/mail/repo/release.tmpl b/themes/aurora/mail/repo/release.tmpl
index 47a0f00..638721f 100644
--- a/themes/aurora/mail/repo/release.tmpl
+++ b/themes/aurora/mail/repo/release.tmpl
@@ -26,16 +26,16 @@
       <tr><td class="resp-card" style="padding:48px 40px;background:rgba(25,20,50,0.8);border:1px solid rgba(13,148,136,0.2);box-shadow:0 0 60px rgba(13,148,136,0.08),0 0 120px rgba(99,102,241,0.04);">
         <p class="resp-heading" style="margin:0 0 20px;font-size:24px;font-weight:300;color:#ccfbf1;line-height:1.3;letter-spacing:-0.5px;"></p>
         <p style="margin:0 0 24px;font-size:14px;line-height:2;color:rgba(210,252,245,0.88);font-weight:300;">{{$release_url := HTMLFormat "<a href=\047%s\047>%s</a>" .Release.HTMLURL .Release.TagName}}{{$repo_url := HTMLFormat "<a href=\047%s\047>%s</a>" .Release.Repo.HTMLURL .Release.Repo.FullName}}{{.locale.Tr "mail.release.new.text" .Release.Publisher.Name $release_url $repo_url}}
-<h4>{{.locale.Tr "mail.release.title" .Release.Title}}</h4>
-{{if .Release.RenderedNote}}<div>{{.Release.RenderedNote}}</div>{{end}}
-<p>{{.locale.Tr "mail.release.downloads"}}</p>
-<ul>{{if not .DisableDownloadSourceArchives}}<li><a href="{{.Release.Repo.HTMLURL}}/archive/{{.Release.TagName | PathEscapeSegments}}.zip">{{.locale.Tr "mail.release.download.zip"}}</a></li><li><a href="{{.Release.Repo.HTMLURL}}/archive/{{.Release.TagName | PathEscapeSegments}}.tar.gz">{{.locale.Tr "mail.release.download.targz"}}</a></li>{{end}}{{if .Release.Attachments}}{{range .Release.Attachments}}<li><a href="{{.DownloadURL}}">{{.Name}} ({{.Size | FileSize}})</a></li>{{end}}{{end}}</ul></p>
+	<h4>{{.locale.Tr "mail.release.title" .Release.Title}}</h4>
+	{{if .Release.RenderedNote}}{{.locale.Tr "mail.release.note"}}<br><div>{{.Release.RenderedNote}}</div>{{end}}
+	<p>{{.locale.Tr "mail.release.downloads"}}</p>
+	<ul>{{if not .DisableDownloadSourceArchives}}<li><a href="{{.Release.Repo.HTMLURL}}/archive/{{.Release.TagName | PathEscapeSegments}}.zip">{{.locale.Tr "mail.release.download.zip"}}</a></li><li><a href="{{.Release.Repo.HTMLURL}}/archive/{{.Release.TagName | PathEscapeSegments}}.tar.gz">{{.locale.Tr "mail.release.download.targz"}}</a></li>{{end}}{{if .Release.Attachments}}{{range .Release.Attachments}}<li><a href="{{.DownloadURL}}">{{.Name}} ({{.Size | FileSize}})</a></li>{{end}}{{end}}</ul></p>
         <p style="margin:0;font-size:13px;line-height:1.8;color:rgba(180,195,215,0.95);font-weight:300;"></p>
       </td></tr>
       <tr><td style="height:1px;background:linear-gradient(90deg,transparent,rgba(13,148,136,0.3),transparent);"></td></tr>
       <!-- button + link -->
       <tr><td class="resp-spacer" style="padding:40px 40px;text-align:center;">
-        
+
         <table border="0" cellpadding="0" cellspacing="0" width="100%" style="margin:0 0 32px;"><tr><td align="center">
           <a href="{{.Link}}" style="display:inline-block;padding:16px 48px;font-size:14px;font-weight:400;color:#e0f5f3;text-decoration:none;background:rgba(13,148,136,0.18);border:1px solid rgba(13,148,136,0.3);letter-spacing:1px;">{{.locale.Tr "mail.view_it_on" AppName}}</a>
         </td></tr></table>
diff --git a/themes/bloom/mail/repo/issue/default.tmpl b/themes/bloom/mail/repo/issue/default.tmpl
index 8a0e30d..d03930c 100644
--- a/themes/bloom/mail/repo/issue/default.tmpl
+++ b/themes/bloom/mail/repo/issue/default.tmpl
@@ -65,7 +65,8 @@
           {{end}}
         {{else}}
           {{.Body}}
-        {{end -}}
+        {{end -}}{{if .CanReply}}&nbsp;{{.locale.Tr "mail.reply"}}{{end}}
+
         </p>
 
         {{- range .ReviewComments}}
diff --git a/themes/bloom/mail/repo/release.tmpl b/themes/bloom/mail/repo/release.tmpl
index 7e5af55..e31e106 100644
--- a/themes/bloom/mail/repo/release.tmpl
+++ b/themes/bloom/mail/repo/release.tmpl
@@ -31,6 +31,7 @@
         <h4 style="margin:20px 0 8px; font-size:17px; font-weight:600; color:#1e293b;">{{.locale.Tr "mail.release.title" .Release.Title}}</h4>
 
         {{if .Release.RenderedNote}}
+          {{.locale.Tr "mail.release.note"}}<br>
           <div style="margin:12px 0 16px; font-size:14px; line-height:1.6; color:#475569;">
             {{.Release.RenderedNote}}
           </div>
diff --git a/themes/ember/mail/repo/actions/workflow_run.tmpl b/themes/ember/mail/repo/actions/workflow_run.tmpl
index 642cc5b..dca1980 100644
--- a/themes/ember/mail/repo/actions/workflow_run.tmpl
+++ b/themes/ember/mail/repo/actions/workflow_run.tmpl
@@ -43,7 +43,7 @@
         <table border="0" cellpadding="0" cellspacing="0" width="100%" style="margin:16px 0 24px; border-collapse:separate;">
           <tr>
             <td align="center">
-              <a href="{{.Run.HTMLURL}}" style="display:inline-block; padding:14px 40px; font-size:16px; font-weight:600; color:#ffffff; text-decoration:none; background:linear-gradient(135deg, #ea580c, #c2410c); border-radius:50px; font-family:system-ui,sans-serif;">View Workflow Run &#x2699;&#xfe0f;</a>
+              <a href="{{.Run.HTMLURL}}" style="display:inline-block; padding:14px 40px; font-size:16px; font-weight:600; color:#ffffff; text-decoration:none; background:linear-gradient(135deg, #ea580c, #c2410c); border-radius:50px; font-family:system-ui,sans-serif;">{{.locale.Tr "mail.view_it_on" AppName}}</a>
             </td>
           </tr>
         </table>
diff --git a/themes/ember/mail/repo/collaborator.tmpl b/themes/ember/mail/repo/collaborator.tmpl
index 022ff3b..c127314 100644
--- a/themes/ember/mail/repo/collaborator.tmpl
+++ b/themes/ember/mail/repo/collaborator.tmpl
@@ -34,7 +34,7 @@
         <table border="0" cellpadding="0" cellspacing="0" width="100%" style="margin:28px 0 24px; border-collapse:separate;">
           <tr>
             <td align="center">
-              <a href="{{.Link}}" style="display:inline-block; padding:14px 40px; font-size:16px; font-weight:600; color:#ffffff; text-decoration:none; background:linear-gradient(135deg, #ea580c, #c2410c); border-radius:50px; font-family:system-ui,sans-serif;">View Repository &#x1f50d;</a>
+              <a href="{{.Link}}" style="display:inline-block; padding:14px 40px; font-size:16px; font-weight:600; color:#ffffff; text-decoration:none; background:linear-gradient(135deg, #ea580c, #c2410c); border-radius:50px; font-family:system-ui,sans-serif;">{{.locale.Tr "mail.view_it_on" AppName}}</a>
             </td>
           </tr>
         </table>
diff --git a/themes/ember/mail/repo/issue/assigned.tmpl b/themes/ember/mail/repo/issue/assigned.tmpl
index 37175e2..ac878de 100644
--- a/themes/ember/mail/repo/issue/assigned.tmpl
+++ b/themes/ember/mail/repo/issue/assigned.tmpl
@@ -39,7 +39,7 @@
         <table border="0" cellpadding="0" cellspacing="0" width="100%" style="margin:28px 0 24px; border-collapse:separate;">
           <tr>
             <td align="center">
-              <a href="{{.Link}}" style="display:inline-block; padding:14px 40px; font-size:16px; font-weight:600; color:#ffffff; text-decoration:none; background:linear-gradient(135deg, #ea580c, #c2410c); border-radius:50px; font-family:system-ui,sans-serif;">View on {{AppName}} &#x2197;&#xfe0f;</a>
+              <a href="{{.Link}}" style="display:inline-block; padding:14px 40px; font-size:16px; font-weight:600; color:#ffffff; text-decoration:none; background:linear-gradient(135deg, #ea580c, #c2410c); border-radius:50px; font-family:system-ui,sans-serif;">{{.locale.Tr "mail.view_it_on" AppName}}</a>
             </td>
           </tr>
         </table>
diff --git a/themes/ember/mail/repo/issue/default.tmpl b/themes/ember/mail/repo/issue/default.tmpl
index 9645e8b..3d60d84 100644
--- a/themes/ember/mail/repo/issue/default.tmpl
+++ b/themes/ember/mail/repo/issue/default.tmpl
@@ -99,7 +99,7 @@
         <table border="0" cellpadding="0" cellspacing="0" width="100%" style="margin:28px 0 24px; border-collapse:separate;">
           <tr>
             <td align="center">
-              <a href="{{.Link}}" style="display:inline-block; padding:14px 40px; font-size:16px; font-weight:600; color:#ffffff; text-decoration:none; background:linear-gradient(135deg, #ea580c, #c2410c); border-radius:50px; font-family:system-ui,sans-serif;">View on {{AppName}} &#x2197;&#xfe0f;</a>
+              <a href="{{.Link}}" style="display:inline-block; padding:14px 40px; font-size:16px; font-weight:600; color:#ffffff; text-decoration:none; background:linear-gradient(135deg, #ea580c, #c2410c); border-radius:50px; font-family:system-ui,sans-serif;">{{.locale.Tr "mail.view_it_on" AppName}}</a>
             </td>
           </tr>
         </table>
@@ -116,7 +116,7 @@
 
       <div style="padding:20px 32px 24px; background:#fff7ed; border-top:1px solid #fed7aa;">
         <p style="margin:0; font-size:14px; color:#92400e;">
-          &copy; <a href="{{AppUrl}}" style="color:#ea580c; text-decoration:none; font-weight:600;">{{AppName}}</a>
+          &copy; <a href="{{AppUrl}}" style="color:#ea580c; text-decoration:none; font-weight:600;">{{AppName}}</a>{{if .CanReply}}&nbsp;{{.locale.Tr "mail.reply"}}{{end}}
         </p>
         <p style="margin:8px 0 0; font-size:13px; color:#a8a29e;">Built with &#x2764;&#xfe0f; by the community, for the community.</p>
       </div>
diff --git a/themes/ember/mail/repo/release.tmpl b/themes/ember/mail/repo/release.tmpl
index a269c3c..81fbcaf 100644
--- a/themes/ember/mail/repo/release.tmpl
+++ b/themes/ember/mail/repo/release.tmpl
@@ -37,6 +37,7 @@
 
         <h4 style="margin:20px 0 8px; font-size:19px; font-weight:700; color:#9a3412; font-family:Georgia,'Times New Roman',serif;">{{.locale.Tr "mail.release.title" .Release.Title}}</h4>
 
+        <p style="margin:0 0 8px;font-weight:600;color:#9a3412;">{{.locale.Tr "mail.release.note"}}</p>
         {{if .Release.RenderedNote}}
           <div style="margin:12px 0 16px; font-size:15px; line-height:1.6; color:#78350f;">
             {{.Release.RenderedNote}}
@@ -65,7 +66,7 @@
         <table border="0" cellpadding="0" cellspacing="0" width="100%" style="margin:16px 0 24px; border-collapse:separate;">
           <tr>
             <td align="center">
-              <a href="{{.Link}}" style="display:inline-block; padding:14px 40px; font-size:16px; font-weight:600; color:#ffffff; text-decoration:none; background:linear-gradient(135deg, #ea580c, #c2410c); border-radius:50px; font-family:system-ui,sans-serif;">See the Release &#x1f680;</a>
+              <a href="{{.Link}}" style="display:inline-block; padding:14px 40px; font-size:16px; font-weight:600; color:#ffffff; text-decoration:none; background:linear-gradient(135deg, #ea580c, #c2410c); border-radius:50px; font-family:system-ui,sans-serif;">{{.locale.Tr "mail.view_it_on" AppName}}</a>
             </td>
           </tr>
         </table>
diff --git a/themes/ember/mail/repo/transfer.tmpl b/themes/ember/mail/repo/transfer.tmpl
index 0241868..3375c9e 100644
--- a/themes/ember/mail/repo/transfer.tmpl
+++ b/themes/ember/mail/repo/transfer.tmpl
@@ -34,7 +34,7 @@
         <table border="0" cellpadding="0" cellspacing="0" width="100%" style="margin:28px 0 24px; border-collapse:separate;">
           <tr>
             <td align="center">
-              <a href="{{.Link}}" style="display:inline-block; padding:14px 40px; font-size:16px; font-weight:600; color:#ffffff; text-decoration:none; background:linear-gradient(135deg, #ea580c, #c2410c); border-radius:50px; font-family:system-ui,sans-serif;">View Transfer &#x1f4e6;</a>
+              <a href="{{.Link}}" style="display:inline-block; padding:14px 40px; font-size:16px; font-weight:600; color:#ffffff; text-decoration:none; background:linear-gradient(135deg, #ea580c, #c2410c); border-radius:50px; font-family:system-ui,sans-serif;">{{.locale.Tr "mail.view_it_on" AppName}}</a>
             </td>
           </tr>
         </table>
diff --git a/themes/heritage/mail/repo/actions/workflow_run.tmpl b/themes/heritage/mail/repo/actions/workflow_run.tmpl
index d42a555..61c865e 100644
--- a/themes/heritage/mail/repo/actions/workflow_run.tmpl
+++ b/themes/heritage/mail/repo/actions/workflow_run.tmpl
@@ -36,7 +36,7 @@
         <table border="0" cellpadding="0" cellspacing="0" width="100%" style="margin:16px 0 24px; border-collapse:separate;">
           <tr>
             <td align="center">
-              <a href="{{.Run.HTMLURL}}" style="display:inline-block; padding:13px 38px; font-size:15px; font-weight:600; color:#ffffff; text-decoration:none; background-color:#1e3a5f; border:2px solid #8b6914; font-family:Georgia,'Times New Roman',serif; font-variant:small-caps; letter-spacing:1px;">View Workflow Run &#x2192;</a>
+              <a href="{{.Run.HTMLURL}}" style="display:inline-block; padding:13px 38px; font-size:15px; font-weight:600; color:#ffffff; text-decoration:none; background-color:#1e3a5f; border:2px solid #8b6914; font-family:Georgia,'Times New Roman',serif; font-variant:small-caps; letter-spacing:1px;">{{.locale.Tr "mail.view_it_on" AppName}}</a>
             </td>
           </tr>
         </table>
diff --git a/themes/heritage/mail/repo/collaborator.tmpl b/themes/heritage/mail/repo/collaborator.tmpl
index ec7e3fa..fec4b01 100644
--- a/themes/heritage/mail/repo/collaborator.tmpl
+++ b/themes/heritage/mail/repo/collaborator.tmpl
@@ -27,7 +27,7 @@
         <table border="0" cellpadding="0" cellspacing="0" width="100%" style="margin:28px 0 24px; border-collapse:separate;">
           <tr>
             <td align="center">
-              <a href="{{.Link}}" style="display:inline-block; padding:13px 38px; font-size:15px; font-weight:600; color:#ffffff; text-decoration:none; background-color:#1e3a5f; border:2px solid #8b6914; font-family:Georgia,'Times New Roman',serif; font-variant:small-caps; letter-spacing:1px;">View Repository &#x2192;</a>
+              <a href="{{.Link}}" style="display:inline-block; padding:13px 38px; font-size:15px; font-weight:600; color:#ffffff; text-decoration:none; background-color:#1e3a5f; border:2px solid #8b6914; font-family:Georgia,'Times New Roman',serif; font-variant:small-caps; letter-spacing:1px;">{{.locale.Tr "mail.view_it_on" AppName}}</a>
             </td>
           </tr>
         </table>
diff --git a/themes/heritage/mail/repo/issue/assigned.tmpl b/themes/heritage/mail/repo/issue/assigned.tmpl
index e21b913..a7313e5 100644
--- a/themes/heritage/mail/repo/issue/assigned.tmpl
+++ b/themes/heritage/mail/repo/issue/assigned.tmpl
@@ -32,7 +32,7 @@
         <table border="0" cellpadding="0" cellspacing="0" width="100%" style="margin:28px 0 24px; border-collapse:separate;">
           <tr>
             <td align="center">
-              <a href="{{.Link}}" style="display:inline-block; padding:13px 38px; font-size:15px; font-weight:600; color:#ffffff; text-decoration:none; background-color:#1e3a5f; border:2px solid #8b6914; font-family:Georgia,'Times New Roman',serif; font-variant:small-caps; letter-spacing:1px;">View on {{AppName}} &#x2192;</a>
+              <a href="{{.Link}}" style="display:inline-block; padding:13px 38px; font-size:15px; font-weight:600; color:#ffffff; text-decoration:none; background-color:#1e3a5f; border:2px solid #8b6914; font-family:Georgia,'Times New Roman',serif; font-variant:small-caps; letter-spacing:1px;">{{.locale.Tr "mail.view_it_on" AppName}}</a>
             </td>
           </tr>
         </table>
diff --git a/themes/heritage/mail/repo/issue/default.tmpl b/themes/heritage/mail/repo/issue/default.tmpl
index 98be6f0..e61120b 100644
--- a/themes/heritage/mail/repo/issue/default.tmpl
+++ b/themes/heritage/mail/repo/issue/default.tmpl
@@ -92,7 +92,7 @@
         <table border="0" cellpadding="0" cellspacing="0" width="100%" style="margin:28px 0 24px; border-collapse:separate;">
           <tr>
             <td align="center">
-              <a href="{{.Link}}" style="display:inline-block; padding:13px 38px; font-size:15px; font-weight:600; color:#ffffff; text-decoration:none; background-color:#1e3a5f; border:2px solid #8b6914; font-family:Georgia,'Times New Roman',serif; font-variant:small-caps; letter-spacing:1px;">View on {{AppName}} &#x2192;</a>
+              <a href="{{.Link}}" style="display:inline-block; padding:13px 38px; font-size:15px; font-weight:600; color:#ffffff; text-decoration:none; background-color:#1e3a5f; border:2px solid #8b6914; font-family:Georgia,'Times New Roman',serif; font-variant:small-caps; letter-spacing:1px;">{{.locale.Tr "mail.view_it_on" AppName}}</a>
             </td>
           </tr>
         </table>
@@ -109,7 +109,7 @@
 
       <div style="padding:20px 36px 24px; background:#faf8f5; border-top:3px double #c4a97d; text-align:center;">
         <p style="margin:0; font-size:13px; color:#5c4a3a;">
-          &copy; <a href="{{AppUrl}}" style="color:#1e3a5f; text-decoration:none; font-weight:600;">{{AppName}}</a>
+          &copy; <a href="{{AppUrl}}" style="color:#1e3a5f; text-decoration:none; font-weight:600;">{{AppName}}</a>{{if .CanReply}}&nbsp;{{.locale.Tr "mail.reply"}}{{end}}
         </p>
         <p style="margin:8px 0 0; font-size:12px; color:#8b6914; font-family:Georgia,'Times New Roman',serif; font-variant:small-caps; letter-spacing:1px;">Established &middot; Trusted &middot; Open</p>
       </div>
diff --git a/themes/heritage/mail/repo/release.tmpl b/themes/heritage/mail/repo/release.tmpl
index 8a26d36..35b6301 100644
--- a/themes/heritage/mail/repo/release.tmpl
+++ b/themes/heritage/mail/repo/release.tmpl
@@ -30,6 +30,7 @@
 
         <h4 style="margin:20px 0 8px; font-size:19px; font-weight:700; color:#1e3a5f; font-family:Georgia,'Times New Roman',serif;">{{.locale.Tr "mail.release.title" .Release.Title}}</h4>
 
+        <p style="margin:0 0 8px;font-weight:600;color:#1e3a5f;font-style:italic;">{{.locale.Tr "mail.release.note"}}</p>
         {{if .Release.RenderedNote}}
           <div style="margin:12px 0 16px; font-size:15px; line-height:1.7; color:#2c1810;">
             {{.Release.RenderedNote}}
@@ -58,7 +59,7 @@
         <table border="0" cellpadding="0" cellspacing="0" width="100%" style="margin:16px 0 24px; border-collapse:separate;">
           <tr>
             <td align="center">
-              <a href="{{.Link}}" style="display:inline-block; padding:13px 38px; font-size:15px; font-weight:600; color:#ffffff; text-decoration:none; background-color:#1e3a5f; border:2px solid #8b6914; font-family:Georgia,'Times New Roman',serif; font-variant:small-caps; letter-spacing:1px;">See the Release &#x2192;</a>
+              <a href="{{.Link}}" style="display:inline-block; padding:13px 38px; font-size:15px; font-weight:600; color:#ffffff; text-decoration:none; background-color:#1e3a5f; border:2px solid #8b6914; font-family:Georgia,'Times New Roman',serif; font-variant:small-caps; letter-spacing:1px;">{{.locale.Tr "mail.view_it_on" AppName}}</a>
             </td>
           </tr>
         </table>
diff --git a/themes/heritage/mail/repo/transfer.tmpl b/themes/heritage/mail/repo/transfer.tmpl
index ef61d80..addf483 100644
--- a/themes/heritage/mail/repo/transfer.tmpl
+++ b/themes/heritage/mail/repo/transfer.tmpl
@@ -27,7 +27,7 @@
         <table border="0" cellpadding="0" cellspacing="0" width="100%" style="margin:28px 0 24px; border-collapse:separate;">
           <tr>
             <td align="center">
-              <a href="{{.Link}}" style="display:inline-block; padding:13px 38px; font-size:15px; font-weight:600; color:#ffffff; text-decoration:none; background-color:#1e3a5f; border:2px solid #8b6914; font-family:Georgia,'Times New Roman',serif; font-variant:small-caps; letter-spacing:1px;">View Transfer &#x2192;</a>
+              <a href="{{.Link}}" style="display:inline-block; padding:13px 38px; font-size:15px; font-weight:600; color:#ffffff; text-decoration:none; background-color:#1e3a5f; border:2px solid #8b6914; font-family:Georgia,'Times New Roman',serif; font-variant:small-caps; letter-spacing:1px;">{{.locale.Tr "mail.view_it_on" AppName}}</a>
             </td>
           </tr>
         </table>
diff --git a/themes/horizon/mail/repo/issue/default.tmpl b/themes/horizon/mail/repo/issue/default.tmpl
index a746771..16f9ef8 100644
--- a/themes/horizon/mail/repo/issue/default.tmpl
+++ b/themes/horizon/mail/repo/issue/default.tmpl
@@ -71,7 +71,8 @@
           {{end}}
         {{else}}
           {{.Body}}
-        {{end -}}
+        {{end -}}{{if .CanReply}}&nbsp;{{.locale.Tr "mail.reply"}}{{end}}
+
         </p>
 
         {{- range .ReviewComments}}
@@ -118,7 +119,7 @@
         <p style="margin:0; font-size:14px; color:#64748b;">
           © <a href="{{AppUrl}}" target="_blank" rel="noopener noreferrer" style="color:#1e88e5; text-decoration:none; font-weight:500; border-bottom:1px dotted #b9d5f0;">{{AppName}}</a>
         </p>
-        <p style="margin:6px 0 0; font-size:12px; color:#94a3b8;">Secure notification – if you didn’t expect this, please ignore this email.</p>
+        <p style="margin:6px 0 0; font-size:12px; color:#94a3b8;">Secure notification – if you didn't expect this, please ignore this email.</p>
       </div>
 
     </div>
diff --git a/themes/horizon/mail/repo/release.tmpl b/themes/horizon/mail/repo/release.tmpl
index 435cd25..4f83a4a 100644
--- a/themes/horizon/mail/repo/release.tmpl
+++ b/themes/horizon/mail/repo/release.tmpl
@@ -37,6 +37,7 @@
         <h4 style="margin:24px 0 8px; font-size:18px; font-weight:600; color:#1e293b;">{{.locale.Tr "mail.release.title" .Release.Title}}</h4>
 
         {{if .Release.RenderedNote}}
+          {{.locale.Tr "mail.release.note"}}<br>
           <div style="margin:12px 0 16px; font-size:15px; line-height:1.6; color:#334155;">
             {{.Release.RenderedNote}}
           </div>
@@ -84,7 +85,7 @@
         <p style="margin:0; font-size:14px; color:#64748b;">
           © <a href="{{AppUrl}}" target="_blank" rel="noopener noreferrer" style="color:#1e88e5; text-decoration:none; font-weight:500; border-bottom:1px dotted #b9d5f0;">{{AppName}}</a>
         </p>
-        <p style="margin:6px 0 0; font-size:12px; color:#94a3b8;">Secure release notification – if you didn’t expect this, please ignore this email.</p>
+        <p style="margin:6px 0 0; font-size:12px; color:#94a3b8;">Secure release notification – if you didn't expect this, please ignore this email.</p>
       </div>
 
     </div>
diff --git a/themes/ink/mail/org/team_invite.tmpl b/themes/ink/mail/org/team_invite.tmpl
index 27df363..a50a377 100644
--- a/themes/ink/mail/org/team_invite.tmpl
+++ b/themes/ink/mail/org/team_invite.tmpl
@@ -32,9 +32,10 @@
           </p>
           <p style="margin:0 0 12px;font-size:13px;line-height:1.8;color:#444;">{{.locale.Tr "mail.team_invite.text_1" (DotEscape .Inviter.DisplayName) (DotEscape .Team.Name) (DotEscape .Organization.DisplayName)}}</p>
           <p style="margin:0 0 20px;font-size:12px;line-height:1.8;color:#666;font-style:italic;">{{.locale.Tr "mail.team_invite.text_2"}}</p>
+          <p style="margin:0 0 20px;font-size:12px;line-height:1.8;color:#666;font-style:italic;">{{.locale.Tr "mail.team_invite.text_3" .Invite.Email}}</p>
           
           <table border="0" cellpadding="0" cellspacing="0" style="margin:0 0 24px;"><tr><td style="padding:10px 24px;background:#1a1a2e;border:1px solid #c4a97d;">
-            <a href="{{.InviteURL}}" class="resp-btn" style="display:inline-block;font-size:13px;font-weight:700;color:#fefdfb;text-decoration:none;font-variant:small-caps;letter-spacing:1px;">Activate Account &raquo;</a>
+            <a href="{{.InviteURL}}" class="resp-btn" style="display:inline-block;font-size:13px;font-weight:700;color:#fefdfb;text-decoration:none;font-variant:small-caps;letter-spacing:1px;">{{.locale.Tr "mail.view_it_on" AppName}} &raquo;</a>
           </td></tr></table>
           <table width="100%" cellpadding="0" cellspacing="0" border="0" style="border:1px solid #c4a97d;background:#fefdfb;"><tr><td style="padding:12px 14px;">
             <p style="margin:0 0 4px;font-size:10px;color:#888;font-style:italic;">{{.locale.Tr "mail.link_not_working_do_paste"}}</p>
@@ -46,7 +47,6 @@
           <p style="margin:0 0 10px;font-size:10px;color:#888;text-transform:uppercase;letter-spacing:1px;font-family:system-ui,sans-serif;font-weight:700;">Quick Info</p>
           <table width="100%" cellpadding="0" cellspacing="0" border="0" style="border-top:1px solid #ddd;border-bottom:1px solid #ddd;">
             <tr><td style="padding:8px 0;font-size:11px;color:#555;font-family:system-ui,sans-serif;">From<br /><strong style="color:#1a1a2e;">{{AppName}}</strong></td></tr>
-            <tr><td style="padding:8px 0;border-top:1px solid #ddd;font-size:11px;color:#555;font-family:system-ui,sans-serif;">Expires<br /><strong style="color:#1a1a2e;">{{.ActiveCodeLives}}</strong></td></tr>
           </table>
         </td>
       </tr>
diff --git a/themes/ink/mail/repo/actions/workflow_run.tmpl b/themes/ink/mail/repo/actions/workflow_run.tmpl
index 5c0fb86..d5bcf84 100644
--- a/themes/ink/mail/repo/actions/workflow_run.tmpl
+++ b/themes/ink/mail/repo/actions/workflow_run.tmpl
@@ -34,7 +34,7 @@
           <p style="margin:0 0 20px;font-size:12px;line-height:1.8;color:#666;font-style:italic;"></p>
           
           <table border="0" cellpadding="0" cellspacing="0" style="margin:0 0 24px;"><tr><td style="padding:10px 24px;background:#1a1a2e;border:1px solid #c4a97d;">
-            <a href="{{.Run.HTMLURL}}" class="resp-btn" style="display:inline-block;font-size:13px;font-weight:700;color:#fefdfb;text-decoration:none;font-variant:small-caps;letter-spacing:1px;">Activate Account &raquo;</a>
+            <a href="{{.Run.HTMLURL}}" class="resp-btn" style="display:inline-block;font-size:13px;font-weight:700;color:#fefdfb;text-decoration:none;font-variant:small-caps;letter-spacing:1px;">{{.locale.Tr "mail.view_it_on" AppName}} &raquo;</a>
           </td></tr></table>
           <table width="100%" cellpadding="0" cellspacing="0" border="0" style="border:1px solid #c4a97d;background:#fefdfb;"><tr><td style="padding:12px 14px;">
             <p style="margin:0 0 4px;font-size:10px;color:#888;font-style:italic;">{{.locale.Tr "mail.link_not_working_do_paste"}}</p>
@@ -46,7 +46,6 @@
           <p style="margin:0 0 10px;font-size:10px;color:#888;text-transform:uppercase;letter-spacing:1px;font-family:system-ui,sans-serif;font-weight:700;">Quick Info</p>
           <table width="100%" cellpadding="0" cellspacing="0" border="0" style="border-top:1px solid #ddd;border-bottom:1px solid #ddd;">
             <tr><td style="padding:8px 0;font-size:11px;color:#555;font-family:system-ui,sans-serif;">From<br /><strong style="color:#1a1a2e;">{{AppName}}</strong></td></tr>
-            <tr><td style="padding:8px 0;border-top:1px solid #ddd;font-size:11px;color:#555;font-family:system-ui,sans-serif;">Expires<br /><strong style="color:#1a1a2e;">{{.ActiveCodeLives}}</strong></td></tr>
           </table>
         </td>
       </tr>
diff --git a/themes/ink/mail/repo/collaborator.tmpl b/themes/ink/mail/repo/collaborator.tmpl
index 41f79e6..8d1cd9e 100644
--- a/themes/ink/mail/repo/collaborator.tmpl
+++ b/themes/ink/mail/repo/collaborator.tmpl
@@ -34,7 +34,7 @@
           <p style="margin:0 0 20px;font-size:12px;line-height:1.8;color:#666;font-style:italic;"></p>
           
           <table border="0" cellpadding="0" cellspacing="0" style="margin:0 0 24px;"><tr><td style="padding:10px 24px;background:#1a1a2e;border:1px solid #c4a97d;">
-            <a href="{{.Link}}" class="resp-btn" style="display:inline-block;font-size:13px;font-weight:700;color:#fefdfb;text-decoration:none;font-variant:small-caps;letter-spacing:1px;">Activate Account &raquo;</a>
+            <a href="{{.Link}}" class="resp-btn" style="display:inline-block;font-size:13px;font-weight:700;color:#fefdfb;text-decoration:none;font-variant:small-caps;letter-spacing:1px;">{{.locale.Tr "mail.view_it_on" AppName}} &raquo;</a>
           </td></tr></table>
           <table width="100%" cellpadding="0" cellspacing="0" border="0" style="border:1px solid #c4a97d;background:#fefdfb;"><tr><td style="padding:12px 14px;">
             <p style="margin:0 0 4px;font-size:10px;color:#888;font-style:italic;">{{.locale.Tr "mail.link_not_working_do_paste"}}</p>
@@ -46,7 +46,6 @@
           <p style="margin:0 0 10px;font-size:10px;color:#888;text-transform:uppercase;letter-spacing:1px;font-family:system-ui,sans-serif;font-weight:700;">Quick Info</p>
           <table width="100%" cellpadding="0" cellspacing="0" border="0" style="border-top:1px solid #ddd;border-bottom:1px solid #ddd;">
             <tr><td style="padding:8px 0;font-size:11px;color:#555;font-family:system-ui,sans-serif;">From<br /><strong style="color:#1a1a2e;">{{AppName}}</strong></td></tr>
-            <tr><td style="padding:8px 0;border-top:1px solid #ddd;font-size:11px;color:#555;font-family:system-ui,sans-serif;">Expires<br /><strong style="color:#1a1a2e;">{{.ActiveCodeLives}}</strong></td></tr>
           </table>
         </td>
       </tr>
diff --git a/themes/ink/mail/repo/issue/assigned.tmpl b/themes/ink/mail/repo/issue/assigned.tmpl
index cf40df3..ba01e51 100644
--- a/themes/ink/mail/repo/issue/assigned.tmpl
+++ b/themes/ink/mail/repo/issue/assigned.tmpl
@@ -34,7 +34,7 @@
           <p style="margin:0 0 20px;font-size:12px;line-height:1.8;color:#666;font-style:italic;"></p>
           
           <table border="0" cellpadding="0" cellspacing="0" style="margin:0 0 24px;"><tr><td style="padding:10px 24px;background:#1a1a2e;border:1px solid #c4a97d;">
-            <a href="{{.Link}}" class="resp-btn" style="display:inline-block;font-size:13px;font-weight:700;color:#fefdfb;text-decoration:none;font-variant:small-caps;letter-spacing:1px;">Activate Account &raquo;</a>
+            <a href="{{.Link}}" class="resp-btn" style="display:inline-block;font-size:13px;font-weight:700;color:#fefdfb;text-decoration:none;font-variant:small-caps;letter-spacing:1px;">{{.locale.Tr "mail.view_it_on" AppName}} &raquo;</a>
           </td></tr></table>
           <table width="100%" cellpadding="0" cellspacing="0" border="0" style="border:1px solid #c4a97d;background:#fefdfb;"><tr><td style="padding:12px 14px;">
             <p style="margin:0 0 4px;font-size:10px;color:#888;font-style:italic;">{{.locale.Tr "mail.link_not_working_do_paste"}}</p>
@@ -46,7 +46,6 @@
           <p style="margin:0 0 10px;font-size:10px;color:#888;text-transform:uppercase;letter-spacing:1px;font-family:system-ui,sans-serif;font-weight:700;">Quick Info</p>
           <table width="100%" cellpadding="0" cellspacing="0" border="0" style="border-top:1px solid #ddd;border-bottom:1px solid #ddd;">
             <tr><td style="padding:8px 0;font-size:11px;color:#555;font-family:system-ui,sans-serif;">From<br /><strong style="color:#1a1a2e;">{{AppName}}</strong></td></tr>
-            <tr><td style="padding:8px 0;border-top:1px solid #ddd;font-size:11px;color:#555;font-family:system-ui,sans-serif;">Expires<br /><strong style="color:#1a1a2e;">{{.ActiveCodeLives}}</strong></td></tr>
           </table>
         </td>
       </tr>
diff --git a/themes/ink/mail/repo/issue/default.tmpl b/themes/ink/mail/repo/issue/default.tmpl
index 14a18b3..24f61c8 100644
--- a/themes/ink/mail/repo/issue/default.tmpl
+++ b/themes/ink/mail/repo/issue/default.tmpl
@@ -7,6 +7,7 @@
   <title>{{.Subject}}</title>
   <style type="text/css">
     body,.ExternalClass,.ReadMsgBody{background-color:#ede4d4}
+    blockquote { padding-left: 1em; margin: 1em 0; border-left: 1px solid #c4a97d; color: #777 }
     @media only screen and (max-width:480px){
       .resp-pad{padding-left:16px!important;padding-right:16px!important}
       .resp-col{width:100%!important;display:block!important;border-left:none!important;padding-left:28px!important;padding-right:28px!important;padding-top:0!important}
@@ -34,7 +35,7 @@
           <p style="margin:0 0 20px;font-size:12px;line-height:1.8;color:#666;font-style:italic;"></p>
           
           <table border="0" cellpadding="0" cellspacing="0" style="margin:0 0 24px;"><tr><td style="padding:10px 24px;background:#1a1a2e;border:1px solid #c4a97d;">
-            <a href="{{.Link}}" class="resp-btn" style="display:inline-block;font-size:13px;font-weight:700;color:#fefdfb;text-decoration:none;font-variant:small-caps;letter-spacing:1px;">Activate Account &raquo;</a>
+            <a href="{{.Link}}" class="resp-btn" style="display:inline-block;font-size:13px;font-weight:700;color:#fefdfb;text-decoration:none;font-variant:small-caps;letter-spacing:1px;">{{.locale.Tr "mail.view_it_on" AppName}} &raquo;</a>
           </td></tr></table>
           <table width="100%" cellpadding="0" cellspacing="0" border="0" style="border:1px solid #c4a97d;background:#fefdfb;"><tr><td style="padding:12px 14px;">
             <p style="margin:0 0 4px;font-size:10px;color:#888;font-style:italic;">{{.locale.Tr "mail.link_not_working_do_paste"}}</p>
@@ -46,13 +47,12 @@
           <p style="margin:0 0 10px;font-size:10px;color:#888;text-transform:uppercase;letter-spacing:1px;font-family:system-ui,sans-serif;font-weight:700;">Quick Info</p>
           <table width="100%" cellpadding="0" cellspacing="0" border="0" style="border-top:1px solid #ddd;border-bottom:1px solid #ddd;">
             <tr><td style="padding:8px 0;font-size:11px;color:#555;font-family:system-ui,sans-serif;">From<br /><strong style="color:#1a1a2e;">{{AppName}}</strong></td></tr>
-            <tr><td style="padding:8px 0;border-top:1px solid #ddd;font-size:11px;color:#555;font-family:system-ui,sans-serif;">Expires<br /><strong style="color:#1a1a2e;">{{.ActiveCodeLives}}</strong></td></tr>
           </table>
         </td>
       </tr>
       <!-- footer -->
       <tr><td colspan="2" style="padding:16px 28px;border-top:1px solid #ccc;text-align:center;">
-        <p style="margin:0;font-size:11px;color:#888;font-style:italic;">&copy; <a href="{{AppUrl}}" style="color:#1a1a2e;text-decoration:none;font-weight:600;border-bottom:1px dotted #c4a97d;">{{AppName}}</a> &mdash; Gitea Mail Templates</p>
+        <p style="margin:0;font-size:11px;color:#888;font-style:italic;">&copy; <a href="{{AppUrl}}" style="color:#1a1a2e;text-decoration:none;font-weight:600;border-bottom:1px dotted #c4a97d;">{{AppName}}</a> &mdash; <a href="{{.Link}}" style="color:#1a1a2e;text-decoration:none;">{{.locale.Tr "mail.view_it_on" AppName}}</a>{{if .CanReply}}&nbsp;{{.locale.Tr "mail.reply"}}{{end}}.</p>
       </td></tr>
     </table>
   </center>
diff --git a/themes/ink/mail/repo/release.tmpl b/themes/ink/mail/repo/release.tmpl
index 44444e6..83ba50f 100644
--- a/themes/ink/mail/repo/release.tmpl
+++ b/themes/ink/mail/repo/release.tmpl
@@ -32,13 +32,14 @@
           </p>
           <p style="margin:0 0 12px;font-size:13px;line-height:1.8;color:#444;">{{$release_url := HTMLFormat "<a href=\047%s\047>%s</a>" .Release.HTMLURL .Release.TagName}}{{$repo_url := HTMLFormat "<a href=\047%s\047>%s</a>" .Release.Repo.HTMLURL .Release.Repo.FullName}}{{.locale.Tr "mail.release.new.text" .Release.Publisher.Name $release_url $repo_url}}
 <h4>{{.locale.Tr "mail.release.title" .Release.Title}}</h4>
-{{if .Release.RenderedNote}}<div>{{.Release.RenderedNote}}</div>{{end}}
+<p>{{.locale.Tr "mail.release.note"}}<br>
+{{if .Release.RenderedNote}}<div>{{.Release.RenderedNote}}</div>{{end}}</p>
 <p>{{.locale.Tr "mail.release.downloads"}}</p>
 <ul>{{if not .DisableDownloadSourceArchives}}<li><a href="{{.Release.Repo.HTMLURL}}/archive/{{.Release.TagName | PathEscapeSegments}}.zip">{{.locale.Tr "mail.release.download.zip"}}</a></li><li><a href="{{.Release.Repo.HTMLURL}}/archive/{{.Release.TagName | PathEscapeSegments}}.tar.gz">{{.locale.Tr "mail.release.download.targz"}}</a></li>{{end}}{{if .Release.Attachments}}{{range .Release.Attachments}}<li><a href="{{.DownloadURL}}">{{.Name}} ({{.Size | FileSize}})</a></li>{{end}}{{end}}</ul></p>
           <p style="margin:0 0 20px;font-size:12px;line-height:1.8;color:#666;font-style:italic;"></p>
           
           <table border="0" cellpadding="0" cellspacing="0" style="margin:0 0 24px;"><tr><td style="padding:10px 24px;background:#1a1a2e;border:1px solid #c4a97d;">
-            <a href="{{.Link}}" class="resp-btn" style="display:inline-block;font-size:13px;font-weight:700;color:#fefdfb;text-decoration:none;font-variant:small-caps;letter-spacing:1px;">Activate Account &raquo;</a>
+            <a href="{{.Link}}" class="resp-btn" style="display:inline-block;font-size:13px;font-weight:700;color:#fefdfb;text-decoration:none;font-variant:small-caps;letter-spacing:1px;">{{.locale.Tr "mail.view_it_on" AppName}} &raquo;</a>
           </td></tr></table>
           <table width="100%" cellpadding="0" cellspacing="0" border="0" style="border:1px solid #c4a97d;background:#fefdfb;"><tr><td style="padding:12px 14px;">
             <p style="margin:0 0 4px;font-size:10px;color:#888;font-style:italic;">{{.locale.Tr "mail.link_not_working_do_paste"}}</p>
@@ -50,7 +51,6 @@
           <p style="margin:0 0 10px;font-size:10px;color:#888;text-transform:uppercase;letter-spacing:1px;font-family:system-ui,sans-serif;font-weight:700;">Quick Info</p>
           <table width="100%" cellpadding="0" cellspacing="0" border="0" style="border-top:1px solid #ddd;border-bottom:1px solid #ddd;">
             <tr><td style="padding:8px 0;font-size:11px;color:#555;font-family:system-ui,sans-serif;">From<br /><strong style="color:#1a1a2e;">{{AppName}}</strong></td></tr>
-            <tr><td style="padding:8px 0;border-top:1px solid #ddd;font-size:11px;color:#555;font-family:system-ui,sans-serif;">Expires<br /><strong style="color:#1a1a2e;">{{.ActiveCodeLives}}</strong></td></tr>
           </table>
         </td>
       </tr>
diff --git a/themes/ink/mail/repo/transfer.tmpl b/themes/ink/mail/repo/transfer.tmpl
index da91ad3..a992cd7 100644
--- a/themes/ink/mail/repo/transfer.tmpl
+++ b/themes/ink/mail/repo/transfer.tmpl
@@ -34,7 +34,7 @@
           <p style="margin:0 0 20px;font-size:12px;line-height:1.8;color:#666;font-style:italic;"></p>
           
           <table border="0" cellpadding="0" cellspacing="0" style="margin:0 0 24px;"><tr><td style="padding:10px 24px;background:#1a1a2e;border:1px solid #c4a97d;">
-            <a href="{{.Link}}" class="resp-btn" style="display:inline-block;font-size:13px;font-weight:700;color:#fefdfb;text-decoration:none;font-variant:small-caps;letter-spacing:1px;">Activate Account &raquo;</a>
+            <a href="{{.Link}}" class="resp-btn" style="display:inline-block;font-size:13px;font-weight:700;color:#fefdfb;text-decoration:none;font-variant:small-caps;letter-spacing:1px;">{{.locale.Tr "mail.view_it_on" AppName}} &raquo;</a>
           </td></tr></table>
           <table width="100%" cellpadding="0" cellspacing="0" border="0" style="border:1px solid #c4a97d;background:#fefdfb;"><tr><td style="padding:12px 14px;">
             <p style="margin:0 0 4px;font-size:10px;color:#888;font-style:italic;">{{.locale.Tr "mail.link_not_working_do_paste"}}</p>
@@ -46,7 +46,6 @@
           <p style="margin:0 0 10px;font-size:10px;color:#888;text-transform:uppercase;letter-spacing:1px;font-family:system-ui,sans-serif;font-weight:700;">Quick Info</p>
           <table width="100%" cellpadding="0" cellspacing="0" border="0" style="border-top:1px solid #ddd;border-bottom:1px solid #ddd;">
             <tr><td style="padding:8px 0;font-size:11px;color:#555;font-family:system-ui,sans-serif;">From<br /><strong style="color:#1a1a2e;">{{AppName}}</strong></td></tr>
-            <tr><td style="padding:8px 0;border-top:1px solid #ddd;font-size:11px;color:#555;font-family:system-ui,sans-serif;">Expires<br /><strong style="color:#1a1a2e;">{{.ActiveCodeLives}}</strong></td></tr>
           </table>
         </td>
       </tr>
diff --git a/themes/ink/mail/user/auth/register_notify.tmpl b/themes/ink/mail/user/auth/register_notify.tmpl
index 6f50223..6da4ec4 100644
--- a/themes/ink/mail/user/auth/register_notify.tmpl
+++ b/themes/ink/mail/user/auth/register_notify.tmpl
@@ -36,7 +36,7 @@
 {{.locale.Tr "mail.register_notify.text_3" $set_pwd_url}}</p>
           
           <table border="0" cellpadding="0" cellspacing="0" style="margin:0 0 24px;"><tr><td style="padding:10px 24px;background:#1a1a2e;border:1px solid #c4a97d;">
-            <a href="{{AppUrl}}user/login" class="resp-btn" style="display:inline-block;font-size:13px;font-weight:700;color:#fefdfb;text-decoration:none;font-variant:small-caps;letter-spacing:1px;">Activate Account &raquo;</a>
+            <a href="{{AppUrl}}user/login" class="resp-btn" style="display:inline-block;font-size:13px;font-weight:700;color:#fefdfb;text-decoration:none;font-variant:small-caps;letter-spacing:1px;">{{.locale.Tr "mail.view_it_on" AppName}} &raquo;</a>
           </td></tr></table>
           <table width="100%" cellpadding="0" cellspacing="0" border="0" style="border:1px solid #c4a97d;background:#fefdfb;"><tr><td style="padding:12px 14px;">
             <p style="margin:0 0 4px;font-size:10px;color:#888;font-style:italic;">{{.locale.Tr "mail.link_not_working_do_paste"}}</p>
@@ -48,7 +48,6 @@
           <p style="margin:0 0 10px;font-size:10px;color:#888;text-transform:uppercase;letter-spacing:1px;font-family:system-ui,sans-serif;font-weight:700;">Quick Info</p>
           <table width="100%" cellpadding="0" cellspacing="0" border="0" style="border-top:1px solid #ddd;border-bottom:1px solid #ddd;">
             <tr><td style="padding:8px 0;font-size:11px;color:#555;font-family:system-ui,sans-serif;">From<br /><strong style="color:#1a1a2e;">{{AppName}}</strong></td></tr>
-            <tr><td style="padding:8px 0;border-top:1px solid #ddd;font-size:11px;color:#555;font-family:system-ui,sans-serif;">Expires<br /><strong style="color:#1a1a2e;">{{.ActiveCodeLives}}</strong></td></tr>
           </table>
         </td>
       </tr>
diff --git a/themes/ink/mail/user/auth/reset_passwd.tmpl b/themes/ink/mail/user/auth/reset_passwd.tmpl
index d09ba38..ad99ff3 100644
--- a/themes/ink/mail/user/auth/reset_passwd.tmpl
+++ b/themes/ink/mail/user/auth/reset_passwd.tmpl
@@ -34,7 +34,7 @@
           <p style="margin:0 0 20px;font-size:12px;line-height:1.8;color:#666;font-style:italic;"></p>
           {{$recover_url := printf "%suser/recover_account?code=%s" AppUrl (QueryEscape .Code)}}
           <table border="0" cellpadding="0" cellspacing="0" style="margin:0 0 24px;"><tr><td style="padding:10px 24px;background:#1a1a2e;border:1px solid #c4a97d;">
-            <a href="{{$recover_url}}" class="resp-btn" style="display:inline-block;font-size:13px;font-weight:700;color:#fefdfb;text-decoration:none;font-variant:small-caps;letter-spacing:1px;">Activate Account &raquo;</a>
+            <a href="{{$recover_url}}" class="resp-btn" style="display:inline-block;font-size:13px;font-weight:700;color:#fefdfb;text-decoration:none;font-variant:small-caps;letter-spacing:1px;">{{.locale.Tr "mail.view_it_on" AppName}} &raquo;</a>
           </td></tr></table>
           <table width="100%" cellpadding="0" cellspacing="0" border="0" style="border:1px solid #c4a97d;background:#fefdfb;"><tr><td style="padding:12px 14px;">
             <p style="margin:0 0 4px;font-size:10px;color:#888;font-style:italic;">{{.locale.Tr "mail.link_not_working_do_paste"}}</p>
@@ -46,7 +46,7 @@
           <p style="margin:0 0 10px;font-size:10px;color:#888;text-transform:uppercase;letter-spacing:1px;font-family:system-ui,sans-serif;font-weight:700;">Quick Info</p>
           <table width="100%" cellpadding="0" cellspacing="0" border="0" style="border-top:1px solid #ddd;border-bottom:1px solid #ddd;">
             <tr><td style="padding:8px 0;font-size:11px;color:#555;font-family:system-ui,sans-serif;">From<br /><strong style="color:#1a1a2e;">{{AppName}}</strong></td></tr>
-            <tr><td style="padding:8px 0;border-top:1px solid #ddd;font-size:11px;color:#555;font-family:system-ui,sans-serif;">Expires<br /><strong style="color:#1a1a2e;">{{.ActiveCodeLives}}</strong></td></tr>
+            <tr><td style="padding:8px 0;border-top:1px solid #ddd;font-size:11px;color:#555;font-family:system-ui,sans-serif;">Expires<br /><strong style="color:#1a1a2e;">{{.ResetPwdCodeLives}}</strong></td></tr>
           </table>
         </td>
       </tr>
diff --git a/themes/mono/mail/repo/actions/workflow_run.tmpl b/themes/mono/mail/repo/actions/workflow_run.tmpl
index fa11147..af191ff 100644
--- a/themes/mono/mail/repo/actions/workflow_run.tmpl
+++ b/themes/mono/mail/repo/actions/workflow_run.tmpl
@@ -38,9 +38,9 @@
       </td></tr>
       <!-- button -->
       <tr><td class="resp-pad" style="padding:0 32px 24px;">
-        
+
         <table border="0" cellpadding="0" cellspacing="0"><tr><td style="border:2px solid #000;padding:14px 32px;">
-          <a href="{{.Run.HTMLURL}}" class="resp-btn" style="display:inline-block;font-size:14px;font-weight:900;color:#000;text-decoration:none;letter-spacing:-0.3px;">ACTIVATE</a>
+          <a href="{{.Run.HTMLURL}}" class="resp-btn" style="display:inline-block;font-size:14px;font-weight:900;color:#000;text-decoration:none;letter-spacing:-0.3px;">{{.locale.Tr "mail.view_it_on" AppName}}</a>
         </td></tr></table>
         <table width="100%" cellpadding="0" cellspacing="0" border="0" style="margin:24px 0 0;"><tr><td style="padding:12px 16px;background:#f5f5f5;border:1px solid #ccc;">
           <p style="margin:0 0 6px;font-size:11px;color:#888;">{{.locale.Tr "mail.link_not_working_do_paste"}}</p>
diff --git a/themes/mono/mail/repo/collaborator.tmpl b/themes/mono/mail/repo/collaborator.tmpl
index 4b807bb..fcafbe4 100644
--- a/themes/mono/mail/repo/collaborator.tmpl
+++ b/themes/mono/mail/repo/collaborator.tmpl
@@ -38,9 +38,9 @@
       </td></tr>
       <!-- button -->
       <tr><td class="resp-pad" style="padding:0 32px 24px;">
-        
+
         <table border="0" cellpadding="0" cellspacing="0"><tr><td style="border:2px solid #000;padding:14px 32px;">
-          <a href="{{.Link}}" class="resp-btn" style="display:inline-block;font-size:14px;font-weight:900;color:#000;text-decoration:none;letter-spacing:-0.3px;">ACTIVATE</a>
+          <a href="{{.Link}}" class="resp-btn" style="display:inline-block;font-size:14px;font-weight:900;color:#000;text-decoration:none;letter-spacing:-0.3px;">{{.locale.Tr "mail.view_it_on" AppName}}</a>
         </td></tr></table>
         <table width="100%" cellpadding="0" cellspacing="0" border="0" style="margin:24px 0 0;"><tr><td style="padding:12px 16px;background:#f5f5f5;border:1px solid #ccc;">
           <p style="margin:0 0 6px;font-size:11px;color:#888;">{{.locale.Tr "mail.link_not_working_do_paste"}}</p>
diff --git a/themes/mono/mail/repo/issue/assigned.tmpl b/themes/mono/mail/repo/issue/assigned.tmpl
index 3c4ee30..78efa7b 100644
--- a/themes/mono/mail/repo/issue/assigned.tmpl
+++ b/themes/mono/mail/repo/issue/assigned.tmpl
@@ -38,9 +38,9 @@
       </td></tr>
       <!-- button -->
       <tr><td class="resp-pad" style="padding:0 32px 24px;">
-        
+
         <table border="0" cellpadding="0" cellspacing="0"><tr><td style="border:2px solid #000;padding:14px 32px;">
-          <a href="{{.Link}}" class="resp-btn" style="display:inline-block;font-size:14px;font-weight:900;color:#000;text-decoration:none;letter-spacing:-0.3px;">ACTIVATE</a>
+          <a href="{{.Link}}" class="resp-btn" style="display:inline-block;font-size:14px;font-weight:900;color:#000;text-decoration:none;letter-spacing:-0.3px;">{{.locale.Tr "mail.view_it_on" AppName}}</a>
         </td></tr></table>
         <table width="100%" cellpadding="0" cellspacing="0" border="0" style="margin:24px 0 0;"><tr><td style="padding:12px 16px;background:#f5f5f5;border:1px solid #ccc;">
           <p style="margin:0 0 6px;font-size:11px;color:#888;">{{.locale.Tr "mail.link_not_working_do_paste"}}</p>
diff --git a/themes/mono/mail/repo/issue/default.tmpl b/themes/mono/mail/repo/issue/default.tmpl
index a9b48a5..f437369 100644
--- a/themes/mono/mail/repo/issue/default.tmpl
+++ b/themes/mono/mail/repo/issue/default.tmpl
@@ -14,6 +14,7 @@
       .resp-btn{display:block!important;width:auto!important}
       .resp-heading{font-size:22px!important}
     }
+    blockquote { padding-left: 1em; margin: 1em 0; border-left: 2px solid #ff0000; color: #666 }
   </style>
 </head>
 <body style="margin:0;padding:0;background:#fafafa;font-family:system-ui,-apple-system,sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;">
@@ -38,9 +39,9 @@
       </td></tr>
       <!-- button -->
       <tr><td class="resp-pad" style="padding:0 32px 24px;">
-        
+
         <table border="0" cellpadding="0" cellspacing="0"><tr><td style="border:2px solid #000;padding:14px 32px;">
-          <a href="{{.Link}}" class="resp-btn" style="display:inline-block;font-size:14px;font-weight:900;color:#000;text-decoration:none;letter-spacing:-0.3px;">ACTIVATE</a>
+          <a href="{{.Link}}" class="resp-btn" style="display:inline-block;font-size:14px;font-weight:900;color:#000;text-decoration:none;letter-spacing:-0.3px;">{{.locale.Tr "mail.view_it_on" AppName}}</a>{{if .CanReply}}&nbsp;{{.locale.Tr "mail.reply"}}{{end}}
         </td></tr></table>
         <table width="100%" cellpadding="0" cellspacing="0" border="0" style="margin:24px 0 0;"><tr><td style="padding:12px 16px;background:#f5f5f5;border:1px solid #ccc;">
           <p style="margin:0 0 6px;font-size:11px;color:#888;">{{.locale.Tr "mail.link_not_working_do_paste"}}</p>
diff --git a/themes/mono/mail/repo/release.tmpl b/themes/mono/mail/repo/release.tmpl
index 7b06bc8..cc2dbb6 100644
--- a/themes/mono/mail/repo/release.tmpl
+++ b/themes/mono/mail/repo/release.tmpl
@@ -31,7 +31,7 @@
               <p class="resp-heading" style="margin:0 0 32px;font-size:28px;font-weight:900;color:#000;line-height:1.1;letter-spacing:-1px;"></p>
               <p style="margin:0 0 8px;font-size:13px;line-height:1.8;color:#333;font-weight:500;">{{$release_url := HTMLFormat "<a href=\047%s\047>%s</a>" .Release.HTMLURL .Release.TagName}}{{$repo_url := HTMLFormat "<a href=\047%s\047>%s</a>" .Release.Repo.HTMLURL .Release.Repo.FullName}}{{.locale.Tr "mail.release.new.text" .Release.Publisher.Name $release_url $repo_url}}
 <h4>{{.locale.Tr "mail.release.title" .Release.Title}}</h4>
-{{if .Release.RenderedNote}}<div>{{.Release.RenderedNote}}</div>{{end}}
+{{if .Release.RenderedNote}}{{.locale.Tr "mail.release.note"}}<br><div>{{.Release.RenderedNote}}</div>{{end}}
 <p>{{.locale.Tr "mail.release.downloads"}}</p>
 <ul>{{if not .DisableDownloadSourceArchives}}<li><a href="{{.Release.Repo.HTMLURL}}/archive/{{.Release.TagName | PathEscapeSegments}}.zip">{{.locale.Tr "mail.release.download.zip"}}</a></li><li><a href="{{.Release.Repo.HTMLURL}}/archive/{{.Release.TagName | PathEscapeSegments}}.tar.gz">{{.locale.Tr "mail.release.download.targz"}}</a></li>{{end}}{{if .Release.Attachments}}{{range .Release.Attachments}}<li><a href="{{.DownloadURL}}">{{.Name}} ({{.Size | FileSize}})</a></li>{{end}}{{end}}</ul></p>
               <p style="margin:0 0 32px;font-size:12px;line-height:1.8;color:#888;border-left:2px solid #e03131;padding-left:12px;"></p>
@@ -42,9 +42,9 @@
       </td></tr>
       <!-- button -->
       <tr><td class="resp-pad" style="padding:0 32px 24px;">
-        
+
         <table border="0" cellpadding="0" cellspacing="0"><tr><td style="border:2px solid #000;padding:14px 32px;">
-          <a href="{{.Link}}" class="resp-btn" style="display:inline-block;font-size:14px;font-weight:900;color:#000;text-decoration:none;letter-spacing:-0.3px;">ACTIVATE</a>
+          <a href="{{.Link}}" class="resp-btn" style="display:inline-block;font-size:14px;font-weight:900;color:#000;text-decoration:none;letter-spacing:-0.3px;">{{.locale.Tr "mail.view_it_on" AppName}}</a>
         </td></tr></table>
         <table width="100%" cellpadding="0" cellspacing="0" border="0" style="margin:24px 0 0;"><tr><td style="padding:12px 16px;background:#f5f5f5;border:1px solid #ccc;">
           <p style="margin:0 0 6px;font-size:11px;color:#888;">{{.locale.Tr "mail.link_not_working_do_paste"}}</p>
diff --git a/themes/mono/mail/repo/transfer.tmpl b/themes/mono/mail/repo/transfer.tmpl
index c8ee559..f621032 100644
--- a/themes/mono/mail/repo/transfer.tmpl
+++ b/themes/mono/mail/repo/transfer.tmpl
@@ -38,9 +38,9 @@
       </td></tr>
       <!-- button -->
       <tr><td class="resp-pad" style="padding:0 32px 24px;">
-        
+
         <table border="0" cellpadding="0" cellspacing="0"><tr><td style="border:2px solid #000;padding:14px 32px;">
-          <a href="{{.Link}}" class="resp-btn" style="display:inline-block;font-size:14px;font-weight:900;color:#000;text-decoration:none;letter-spacing:-0.3px;">ACTIVATE</a>
+          <a href="{{.Link}}" class="resp-btn" style="display:inline-block;font-size:14px;font-weight:900;color:#000;text-decoration:none;letter-spacing:-0.3px;">{{.locale.Tr "mail.view_it_on" AppName}}</a>
         </td></tr></table>
         <table width="100%" cellpadding="0" cellspacing="0" border="0" style="margin:24px 0 0;"><tr><td style="padding:12px 16px;background:#f5f5f5;border:1px solid #ccc;">
           <p style="margin:0 0 6px;font-size:11px;color:#888;">{{.locale.Tr "mail.link_not_working_do_paste"}}</p>
diff --git a/themes/neon/mail/repo/issue/default.tmpl b/themes/neon/mail/repo/issue/default.tmpl
index e63c610..8a8f21e 100644
--- a/themes/neon/mail/repo/issue/default.tmpl
+++ b/themes/neon/mail/repo/issue/default.tmpl
@@ -7,6 +7,7 @@
   <title>{{.Subject}}</title>
   <style type="text/css">
     body,.ExternalClass,.ReadMsgBody{background-color:#0a0a0f}
+    blockquote { padding-left: 1em; margin: 1em 0; border-left: 2px solid #ff00ff; color: #aaa }
     @media only screen and (max-width:480px){
       .resp-pad{padding-left:16px!important;padding-right:16px!important}
       .resp-btn{display:block!important;width:auto!important;text-align:center!important}
@@ -29,9 +30,9 @@
       </td></tr>
       <!-- body -->
       <tr><td class="resp-pad" style="padding:8px 32px 24px;color:#e2e8f0;">
-        <p class="resp-font" style="margin:0 0 8px;font-size:14px;line-height:1.7;color:#cbd5e1;">{{if .IsMention}}<p>{{.locale.Tr "mail.issue.x_mentioned_you" .Doer.Name}}</p>{{end}}{{if eq .ActionName "push"}}<p>{{if .Comment.IsForcePush}}{{$oldCommitUrl := printf "%s/commit/%s" .Comment.Issue.PullRequest.BaseRepo.HTMLURL .Comment.OldCommit}}{{$oldShortSha := ShortSha .Comment.OldCommit}}{{$oldCommitLink := HTMLFormat "<a href=\047%[1]s\047>%[2]s</a>" $oldCommitUrl $oldShortSha}}{{$newCommitUrl := printf "%s/commit/%s" .Comment.Issue.PullRequest.BaseRepo.HTMLURL .Comment.NewCommit}}{{$newShortSha := ShortSha .Comment.NewCommit}}{{$newCommitLink := HTMLFormat "<a href=\047%[1]s\047>%[2]s</a>" $newCommitUrl $newShortSha}}{{.locale.Tr "mail.issue.action.force_push" .Doer.Name .Comment.Issue.PullRequest.HeadBranch $oldCommitLink $newCommitLink}}{{else}}{{.locale.TrN (len .Comment.Commits) "mail.issue.action.push_1" "mail.issue.action.push_n" .Doer.Name .Comment.Issue.PullRequest.HeadBranch (len .Comment.Commits)}}{{end}}</p>{{end}}<p>{{if eq .ActionName "close"}}{{.locale.Tr "mail.issue.action.close" .Doer.Name .Issue.Index}}{{else if eq .ActionName "reopen"}}{{.locale.Tr "mail.issue.action.reopen" .Doer.Name .Issue.Index}}{{else if eq .ActionName "merge"}}{{.locale.Tr "mail.issue.action.merge" .Doer.Name .Issue.Index .Issue.PullRequest.BaseBranch}}{{else if eq .ActionName "approve"}}{{.locale.Tr "mail.issue.action.approve" .Doer.Name}}{{else if eq .ActionName "reject"}}{{.locale.Tr "mail.issue.action.reject" .Doer.Name}}{{else if eq .ActionName "review"}}{{.locale.Tr "mail.issue.action.review" .Doer.Name}}{{else if eq .ActionName "review_dismissed"}}{{.locale.Tr "mail.issue.action.review_dismissed" .Doer.Name .Comment.Review.Reviewer.Name}}{{else if eq .ActionName "ready_for_review"}}{{.locale.Tr "mail.issue.action.ready_for_review" .Doer.Name}}{{end}}{{- if eq .Body ""}}{{if eq .ActionName "new"}}{{.locale.Tr "mail.issue.action.new" .Doer.Name .Issue.Index}}{{end}}{{else}}{{.Body}}{{end -}}</p>{{- range .ReviewComments}}<hr><p>{{$.locale.Tr "mail.issue.in_tree_path" .TreePath}}</p><pre>{{.Patch}}</pre><div>{{.RenderedContent}}</div>{{end -}}{{if eq .ActionName "push"}}<ul>{{range .Comment.Commits}}<li><a href="{{$.Comment.Issue.PullRequest.BaseRepo.HTMLURL}}/commit/{{.ID}}">{{ShortSha .ID.String}}</a> - {{.MessageTitle}}</li>{{end}}</ul>{{end}}</p>
+        <p class="resp-font" style="margin:0 0 8px;font-size:14px;line-height:1.7;color:#cbd5e1;">{{if .IsMention}}<p>{{.locale.Tr "mail.issue.x_mentioned_you" .Doer.Name}}</p>{{end}}{{if eq .ActionName "push"}}<p>{{if .Comment.IsForcePush}}{{$oldCommitUrl := printf "%s/commit/%s" .Comment.Issue.PullRequest.BaseRepo.HTMLURL .Comment.OldCommit}}{{$oldShortSha := ShortSha .Comment.OldCommit}}{{$oldCommitLink := HTMLFormat "<a href=\047%[1]s\047>%[2]s</a>" $oldCommitUrl $oldShortSha}}{{$newCommitUrl := printf "%s/commit/%s" .Comment.Issue.PullRequest.BaseRepo.HTMLURL .Comment.NewCommit}}{{$newShortSha := ShortSha .Comment.NewCommit}}{{$newCommitLink := HTMLFormat "<a href=\047%[1]s\047>%[2]s</a>" $newCommitUrl $newShortSha}}{{.locale.Tr "mail.issue.action.force_push" .Doer.Name .Comment.Issue.PullRequest.HeadBranch $oldCommitLink $newCommitLink}}{{else}}{{.locale.TrN (len .Comment.Commits) "mail.issue.action.push_1" "mail.issue.action.push_n" .Doer.Name .Comment.Issue.PullRequest.HeadBranch (len .Comment.Commits)}}{{end}}</p>{{end}}<p>{{if eq .ActionName "close"}}{{.locale.Tr "mail.issue.action.close" .Doer.Name .Issue.Index}}{{else if eq .ActionName "reopen"}}{{.locale.Tr "mail.issue.action.reopen" .Doer.Name .Issue.Index}}{{else if eq .ActionName "merge"}}{{.locale.Tr "mail.issue.action.merge" .Doer.Name .Issue.Index .Issue.PullRequest.BaseBranch}}{{else if eq .ActionName "approve"}}{{.locale.Tr "mail.issue.action.approve" .Doer.Name}}{{else if eq .ActionName "reject"}}{{.locale.Tr "mail.issue.action.reject" .Doer.Name}}{{else if eq .ActionName "review"}}{{.locale.Tr "mail.issue.action.review" .Doer.Name}}{{else if eq .ActionName "review_dismissed"}}{{.locale.Tr "mail.issue.action.review_dismissed" .Doer.Name .Comment.Review.Reviewer.Name}}{{else if eq .ActionName "ready_for_review"}}{{.locale.Tr "mail.issue.action.ready_for_review" .Doer.Name}}{{end}}{{- if eq .Body ""}}{{if eq .ActionName "new"}}{{.locale.Tr "mail.issue.action.new" .Doer.Name .Issue.Index}}{{end}}{{else}}{{.Body}}{{end -}}{{if .CanReply}}&nbsp;{{.locale.Tr "mail.reply"}}{{end}}</p>{{- range .ReviewComments}}<hr><p>{{$.locale.Tr "mail.issue.in_tree_path" .TreePath}}</p><pre>{{.Patch}}</pre><div>{{.RenderedContent}}</div>{{end -}}{{if eq .ActionName "push"}}<ul>{{range .Comment.Commits}}<li><a href="{{$.Comment.Issue.PullRequest.BaseRepo.HTMLURL}}/commit/{{.ID}}">{{ShortSha .ID.String}}</a> - {{.MessageTitle}}</li>{{end}}</ul>{{end}}</p>
         <p class="resp-font" style="margin:0 0 24px;font-size:13px;color:#64748b;line-height:1.6;"></p>
-        
+
         <table border="0" cellpadding="0" cellspacing="0" width="100%" style="margin:0 0 24px;"><tr><td>
           <a href="{{.Link}}" class="resp-btn" style="display:inline-block;padding:13px 36px;font-size:14px;font-weight:700;color:#0a0a0f;text-decoration:none;background:linear-gradient(135deg,#ff2d95,#e0115f);border:1px solid #ff2d95;box-shadow:0 0 16px rgba(255,45,149,0.4);letter-spacing:1px;text-transform:uppercase;">{{.locale.Tr "mail.view_it_on" AppName}}</a>
         </td></tr></table>
diff --git a/themes/neon/mail/repo/release.tmpl b/themes/neon/mail/repo/release.tmpl
index d10d56b..e868bea 100644
--- a/themes/neon/mail/repo/release.tmpl
+++ b/themes/neon/mail/repo/release.tmpl
@@ -30,12 +30,12 @@
       <!-- body -->
       <tr><td class="resp-pad" style="padding:8px 32px 24px;color:#e2e8f0;">
         <p class="resp-font" style="margin:0 0 8px;font-size:14px;line-height:1.7;color:#cbd5e1;">{{$release_url := HTMLFormat "<a href=\047%s\047>%s</a>" .Release.HTMLURL .Release.TagName}}{{$repo_url := HTMLFormat "<a href=\047%s\047>%s</a>" .Release.Repo.HTMLURL .Release.Repo.FullName}}{{.locale.Tr "mail.release.new.text" .Release.Publisher.Name $release_url $repo_url}}
-<h4>{{.locale.Tr "mail.release.title" .Release.Title}}</h4>
-{{if .Release.RenderedNote}}<div>{{.Release.RenderedNote}}</div>{{end}}
-<p>{{.locale.Tr "mail.release.downloads"}}</p>
-<ul>{{if not .DisableDownloadSourceArchives}}<li><a href="{{.Release.Repo.HTMLURL}}/archive/{{.Release.TagName | PathEscapeSegments}}.zip">{{.locale.Tr "mail.release.download.zip"}}</a></li><li><a href="{{.Release.Repo.HTMLURL}}/archive/{{.Release.TagName | PathEscapeSegments}}.tar.gz">{{.locale.Tr "mail.release.download.targz"}}</a></li>{{end}}{{if .Release.Attachments}}{{range .Release.Attachments}}<li><a href="{{.DownloadURL}}">{{.Name}} ({{.Size | FileSize}})</a></li>{{end}}{{end}}</ul></p>
+	<h4>{{.locale.Tr "mail.release.title" .Release.Title}}</h4>
+	{{if .Release.RenderedNote}}{{.locale.Tr "mail.release.note"}}<br><div>{{.Release.RenderedNote}}</div>{{end}}
+	<p>{{.locale.Tr "mail.release.downloads"}}</p>
+	<ul>{{if not .DisableDownloadSourceArchives}}<li><a href="{{.Release.Repo.HTMLURL}}/archive/{{.Release.TagName | PathEscapeSegments}}.zip">{{.locale.Tr "mail.release.download.zip"}}</a></li><li><a href="{{.Release.Repo.HTMLURL}}/archive/{{.Release.TagName | PathEscapeSegments}}.tar.gz">{{.locale.Tr "mail.release.download.targz"}}</a></li>{{end}}{{if .Release.Attachments}}{{range .Release.Attachments}}<li><a href="{{.DownloadURL}}">{{.Name}} ({{.Size | FileSize}})</a></li>{{end}}{{end}}</ul></p>
         <p class="resp-font" style="margin:0 0 24px;font-size:13px;color:#64748b;line-height:1.6;"></p>
-        
+
         <table border="0" cellpadding="0" cellspacing="0" width="100%" style="margin:0 0 24px;"><tr><td>
           <a href="{{.Link}}" class="resp-btn" style="display:inline-block;padding:13px 36px;font-size:14px;font-weight:700;color:#0a0a0f;text-decoration:none;background:linear-gradient(135deg,#ff2d95,#e0115f);border:1px solid #ff2d95;box-shadow:0 0 16px rgba(255,45,149,0.4);letter-spacing:1px;text-transform:uppercase;">{{.locale.Tr "mail.view_it_on" AppName}}</a>
         </td></tr></table>
diff --git a/themes/terminal/mail/repo/actions/workflow_run.tmpl b/themes/terminal/mail/repo/actions/workflow_run.tmpl
index 60785d2..071e8ed 100644
--- a/themes/terminal/mail/repo/actions/workflow_run.tmpl
+++ b/themes/terminal/mail/repo/actions/workflow_run.tmpl
@@ -41,7 +41,7 @@
         <table border="0" cellpadding="0" cellspacing="0" width="100%" style="margin:16px 0 20px; border-collapse:separate;">
           <tr>
             <td align="left">
-              <a href="{{.Run.HTMLURL}}" style="display:inline-block; padding:11px 24px; font-size:14px; font-weight:700; color:#0d1117; text-decoration:none; background-color:#00ff41; border:2px solid #00ff41; font-family:'JetBrains Mono','Fira Code','Consolas',monospace; letter-spacing:0.5px;">$ tail -f workflow.log</a>
+              <a href="{{.Run.HTMLURL}}" style="display:inline-block; padding:11px 24px; font-size:14px; font-weight:700; color:#0d1117; text-decoration:none; background-color:#00ff41; border:2px solid #00ff41; font-family:'JetBrains Mono','Fira Code','Consolas',monospace; letter-spacing:0.5px;">{{.locale.Tr "mail.view_it_on" AppName}}</a>
             </td>
           </tr>
         </table>
diff --git a/themes/terminal/mail/repo/collaborator.tmpl b/themes/terminal/mail/repo/collaborator.tmpl
index e6ce37c..986f558 100644
--- a/themes/terminal/mail/repo/collaborator.tmpl
+++ b/themes/terminal/mail/repo/collaborator.tmpl
@@ -32,7 +32,7 @@
         <table border="0" cellpadding="0" cellspacing="0" width="100%" style="margin:24px 0 20px; border-collapse:separate;">
           <tr>
             <td align="left">
-              <a href="{{.Link}}" style="display:inline-block; padding:11px 24px; font-size:14px; font-weight:700; color:#0d1117; text-decoration:none; background-color:#00ff41; border:2px solid #00ff41; font-family:'JetBrains Mono','Fira Code','Consolas',monospace; letter-spacing:0.5px;">$ cd repo/ &amp;&amp; ls</a>
+              <a href="{{.Link}}" style="display:inline-block; padding:11px 24px; font-size:14px; font-weight:700; color:#0d1117; text-decoration:none; background-color:#00ff41; border:2px solid #00ff41; font-family:'JetBrains Mono','Fira Code','Consolas',monospace; letter-spacing:0.5px;">{{.locale.Tr "mail.view_it_on" AppName}}</a>
             </td>
           </tr>
         </table>
diff --git a/themes/terminal/mail/repo/issue/assigned.tmpl b/themes/terminal/mail/repo/issue/assigned.tmpl
index 8442080..19d47de 100644
--- a/themes/terminal/mail/repo/issue/assigned.tmpl
+++ b/themes/terminal/mail/repo/issue/assigned.tmpl
@@ -37,7 +37,7 @@
         <table border="0" cellpadding="0" cellspacing="0" width="100%" style="margin:24px 0 20px; border-collapse:separate;">
           <tr>
             <td align="left">
-              <a href="{{.Link}}" style="display:inline-block; padding:11px 24px; font-size:14px; font-weight:700; color:#0d1117; text-decoration:none; background-color:#00ff41; border:2px solid #00ff41; font-family:'JetBrains Mono','Fira Code','Consolas',monospace; letter-spacing:0.5px;">$ view_issue</a>
+              <a href="{{.Link}}" style="display:inline-block; padding:11px 24px; font-size:14px; font-weight:700; color:#0d1117; text-decoration:none; background-color:#00ff41; border:2px solid #00ff41; font-family:'JetBrains Mono','Fira Code','Consolas',monospace; letter-spacing:0.5px;">{{.locale.Tr "mail.view_it_on" AppName}}</a>
             </td>
           </tr>
         </table>
diff --git a/themes/terminal/mail/repo/issue/default.tmpl b/themes/terminal/mail/repo/issue/default.tmpl
index 8bc58a6..c93dbea 100644
--- a/themes/terminal/mail/repo/issue/default.tmpl
+++ b/themes/terminal/mail/repo/issue/default.tmpl
@@ -97,7 +97,7 @@
         <table border="0" cellpadding="0" cellspacing="0" width="100%" style="margin:24px 0 20px; border-collapse:separate;">
           <tr>
             <td align="left">
-              <a href="{{.Link}}" style="display:inline-block; padding:11px 24px; font-size:14px; font-weight:700; color:#0d1117; text-decoration:none; background-color:#00ff41; border:2px solid #00ff41; font-family:'JetBrains Mono','Fira Code','Consolas',monospace; letter-spacing:0.5px;">$ view_on_{{AppName}}</a>
+              <a href="{{.Link}}" style="display:inline-block; padding:11px 24px; font-size:14px; font-weight:700; color:#0d1117; text-decoration:none; background-color:#00ff41; border:2px solid #00ff41; font-family:'JetBrains Mono','Fira Code','Consolas',monospace; letter-spacing:0.5px;">{{.locale.Tr "mail.view_it_on" AppName}}</a>
             </td>
           </tr>
         </table>
@@ -116,7 +116,7 @@
 
       <div style="padding:16px 28px 20px; border-top:1px solid #30363d; background:#0d1117;">
         <p style="margin:0; font-size:12px; color:#484f58;">
-          <span style="color:#8b949e;">#</span> &copy; <a href="{{AppUrl}}" style="color:#58a6ff; text-decoration:none;">{{AppName}}</a>
+          <span style="color:#8b949e;">#</span> &copy; <a href="{{AppUrl}}" style="color:#58a6ff; text-decoration:none;">{{AppName}}</a>{{if .CanReply}}&nbsp;{{.locale.Tr "mail.reply"}}{{end}}
         </p>
         <p style="margin:4px 0 0; font-size:11px; color:#484f58;">
           <span style="color:#8b949e;">#</span> if (!$expecting) { ignore(); }
diff --git a/themes/terminal/mail/repo/release.tmpl b/themes/terminal/mail/repo/release.tmpl
index ea590ef..4537ac4 100644
--- a/themes/terminal/mail/repo/release.tmpl
+++ b/themes/terminal/mail/repo/release.tmpl
@@ -35,6 +35,7 @@
 
         <h4 style="margin:20px 0 8px; font-size:16px; font-weight:700; color:#00ff41;">{{.locale.Tr "mail.release.title" .Release.Title}}</h4>
 
+        <p style="margin:0 0 8px;font-weight:700;color:#00ff41;">$ {{.locale.Tr "mail.release.note"}}</p>
         {{if .Release.RenderedNote}}
           <div style="margin:12px 0 16px; font-size:14px; line-height:1.6; color:#c9d1d9;">
             {{.Release.RenderedNote}}
@@ -63,7 +64,7 @@
         <table border="0" cellpadding="0" cellspacing="0" width="100%" style="margin:16px 0 20px; border-collapse:separate;">
           <tr>
             <td align="left">
-              <a href="{{.Link}}" style="display:inline-block; padding:11px 24px; font-size:14px; font-weight:700; color:#0d1117; text-decoration:none; background-color:#00ff41; border:2px solid #00ff41; font-family:'JetBrains Mono','Fira Code','Consolas',monospace; letter-spacing:0.5px;">$ view_release</a>
+              <a href="{{.Link}}" style="display:inline-block; padding:11px 24px; font-size:14px; font-weight:700; color:#0d1117; text-decoration:none; background-color:#00ff41; border:2px solid #00ff41; font-family:'JetBrains Mono','Fira Code','Consolas',monospace; letter-spacing:0.5px;">{{.locale.Tr "mail.view_it_on" AppName}}</a>
             </td>
           </tr>
         </table>
diff --git a/themes/terminal/mail/repo/transfer.tmpl b/themes/terminal/mail/repo/transfer.tmpl
index f03c000..639363b 100644
--- a/themes/terminal/mail/repo/transfer.tmpl
+++ b/themes/terminal/mail/repo/transfer.tmpl
@@ -32,7 +32,7 @@
         <table border="0" cellpadding="0" cellspacing="0" width="100%" style="margin:24px 0 20px; border-collapse:separate;">
           <tr>
             <td align="left">
-              <a href="{{.Link}}" style="display:inline-block; padding:11px 24px; font-size:14px; font-weight:700; color:#0d1117; text-decoration:none; background-color:#00ff41; border:2px solid #00ff41; font-family:'JetBrains Mono','Fira Code','Consolas',monospace; letter-spacing:0.5px;">$ view_transfer</a>
+              <a href="{{.Link}}" style="display:inline-block; padding:11px 24px; font-size:14px; font-weight:700; color:#0d1117; text-decoration:none; background-color:#00ff41; border:2px solid #00ff41; font-family:'JetBrains Mono','Fira Code','Consolas',monospace; letter-spacing:0.5px;">{{.locale.Tr "mail.view_it_on" AppName}}</a>
             </td>
           </tr>
         </table>
diff --git a/themes/terra/mail/org/team_invite.tmpl b/themes/terra/mail/org/team_invite.tmpl
index f27551a..0a11e32 100644
--- a/themes/terra/mail/org/team_invite.tmpl
+++ b/themes/terra/mail/org/team_invite.tmpl
@@ -32,7 +32,7 @@
       <tr><td class="resp-pad" style="padding:16px 32px 24px;color:#5c4030;">
         <p style="margin:0 0 8px;font-size:15px;line-height:1.8;color:#6b5040;">{{.locale.Tr "mail.team_invite.text_1" (DotEscape .Inviter.DisplayName) (DotEscape .Team.Name) (DotEscape .Organization.DisplayName)}}</p>
         <p style="margin:0 0 24px;font-size:14px;line-height:1.8;color:#8c7a6e;font-style:italic;">{{.locale.Tr "mail.team_invite.text_2"}}</p>
-        
+
         <table border="0" cellpadding="0" cellspacing="0" width="100%" style="margin:0 0 28px;"><tr><td>
           <a href="{{.InviteURL}}" class="resp-btn" style="display:inline-block;padding:14px 38px;font-size:15px;font-weight:600;color:#fff;text-decoration:none;background:#c67b5c;border-radius:24px;letter-spacing:0.3px;">Activate Your Account</a>
         </td></tr></table>
@@ -40,6 +40,7 @@
           <p style="margin:0 0 6px;font-size:12px;color:#8c7a6e;font-style:italic;">{{.locale.Tr "mail.link_not_working_do_paste"}}</p>
           <p style="margin:0;font-size:12px;font-family:monospace;color:#5c4030;background:#fffdf9;padding:10px 12px;border:1px solid #d4c4a8;border-radius:6px;word-break:break-all;">{{.InviteURL}}</p>
         </td></tr></table>
+        <p style="margin:12px 0 0;font-size:13px;line-height:1.6;color:#6b5040;">{{.locale.Tr "mail.team_invite.text_3" .Invite.Email}}</p>
       </td></tr>
       <!-- footer -->
       <tr><td style="padding:20px 32px;border-top:1px solid #d4c4a8;background:#f5ede0;text-align:center;">
diff --git a/themes/terra/mail/repo/actions/workflow_run.tmpl b/themes/terra/mail/repo/actions/workflow_run.tmpl
index b17d4c0..b7c99cf 100644
--- a/themes/terra/mail/repo/actions/workflow_run.tmpl
+++ b/themes/terra/mail/repo/actions/workflow_run.tmpl
@@ -32,9 +32,9 @@
       <tr><td class="resp-pad" style="padding:16px 32px 24px;color:#5c4030;">
         <p style="margin:0 0 8px;font-size:15px;line-height:1.8;color:#6b5040;"><h2>{{.Repo.FullName}} - {{.Run.WorkflowID}}: {{.RunStatusText}}</h2><ul>{{range $job := .Jobs}}<li><a href="{{$job.HTMLURL}}">{{$job.Status}}: {{$job.Name}}{{if gt $job.Attempt 1}} (retry #{{$job.Attempt}}){{end}} - {{$job.Duration}}</a></li>{{end}}</ul></p>
         <p style="margin:0 0 24px;font-size:14px;line-height:1.8;color:#8c7a6e;font-style:italic;"></p>
-        
+
         <table border="0" cellpadding="0" cellspacing="0" width="100%" style="margin:0 0 28px;"><tr><td>
-          <a href="{{.Run.HTMLURL}}" class="resp-btn" style="display:inline-block;padding:14px 38px;font-size:15px;font-weight:600;color:#fff;text-decoration:none;background:#c67b5c;border-radius:24px;letter-spacing:0.3px;">Activate Your Account</a>
+          <a href="{{.Run.HTMLURL}}" class="resp-btn" style="display:inline-block;padding:14px 38px;font-size:15px;font-weight:600;color:#fff;text-decoration:none;background:#c67b5c;border-radius:24px;letter-spacing:0.3px;">{{.locale.Tr "mail.view_it_on" AppName}}</a>
         </td></tr></table>
         <table width="100%" cellpadding="0" cellspacing="0" border="0" style="border:1px solid #d4c4a8;background:#f5ede0;border-radius:8px;"><tr><td style="padding:14px 16px;border-radius:8px;">
           <p style="margin:0 0 6px;font-size:12px;color:#8c7a6e;font-style:italic;">{{.locale.Tr "mail.link_not_working_do_paste"}}</p>
diff --git a/themes/terra/mail/repo/collaborator.tmpl b/themes/terra/mail/repo/collaborator.tmpl
index eecdee6..ae0276f 100644
--- a/themes/terra/mail/repo/collaborator.tmpl
+++ b/themes/terra/mail/repo/collaborator.tmpl
@@ -32,9 +32,9 @@
       <tr><td class="resp-pad" style="padding:16px 32px 24px;color:#5c4030;">
         <p style="margin:0 0 8px;font-size:15px;line-height:1.8;color:#6b5040;">{{.locale.Tr "mail.repo.collaborator.added.text"}} <code>{{.RepoName}}</code>.</p>
         <p style="margin:0 0 24px;font-size:14px;line-height:1.8;color:#8c7a6e;font-style:italic;"></p>
-        
+
         <table border="0" cellpadding="0" cellspacing="0" width="100%" style="margin:0 0 28px;"><tr><td>
-          <a href="{{.Link}}" class="resp-btn" style="display:inline-block;padding:14px 38px;font-size:15px;font-weight:600;color:#fff;text-decoration:none;background:#c67b5c;border-radius:24px;letter-spacing:0.3px;">Activate Your Account</a>
+          <a href="{{.Link}}" class="resp-btn" style="display:inline-block;padding:14px 38px;font-size:15px;font-weight:600;color:#fff;text-decoration:none;background:#c67b5c;border-radius:24px;letter-spacing:0.3px;">{{.locale.Tr "mail.view_it_on" AppName}}</a>
         </td></tr></table>
         <table width="100%" cellpadding="0" cellspacing="0" border="0" style="border:1px solid #d4c4a8;background:#f5ede0;border-radius:8px;"><tr><td style="padding:14px 16px;border-radius:8px;">
           <p style="margin:0 0 6px;font-size:12px;color:#8c7a6e;font-style:italic;">{{.locale.Tr "mail.link_not_working_do_paste"}}</p>
diff --git a/themes/terra/mail/repo/issue/assigned.tmpl b/themes/terra/mail/repo/issue/assigned.tmpl
index 1e3b8c0..afb3b7a 100644
--- a/themes/terra/mail/repo/issue/assigned.tmpl
+++ b/themes/terra/mail/repo/issue/assigned.tmpl
@@ -32,9 +32,9 @@
       <tr><td class="resp-pad" style="padding:16px 32px 24px;color:#5c4030;">
         <p style="margin:0 0 8px;font-size:15px;line-height:1.8;color:#6b5040;">{{$repo_url := HTMLFormat "<a href=\047%s\047>%s</a>" .Issue.Repo.HTMLURL .Issue.Repo.FullName}}{{$link := HTMLFormat "<a href=\047%s\047>#%d</a>" .Link .Issue.Index}}{{if .IsPull}}{{.locale.Tr "mail.issue_assigned.pull" .Doer.Name $link $repo_url}}{{else}}{{.locale.Tr "mail.issue_assigned.issue" .Doer.Name $link $repo_url}}{{end}}</p>
         <p style="margin:0 0 24px;font-size:14px;line-height:1.8;color:#8c7a6e;font-style:italic;"></p>
-        
+
         <table border="0" cellpadding="0" cellspacing="0" width="100%" style="margin:0 0 28px;"><tr><td>
-          <a href="{{.Link}}" class="resp-btn" style="display:inline-block;padding:14px 38px;font-size:15px;font-weight:600;color:#fff;text-decoration:none;background:#c67b5c;border-radius:24px;letter-spacing:0.3px;">Activate Your Account</a>
+          <a href="{{.Link}}" class="resp-btn" style="display:inline-block;padding:14px 38px;font-size:15px;font-weight:600;color:#fff;text-decoration:none;background:#c67b5c;border-radius:24px;letter-spacing:0.3px;">{{.locale.Tr "mail.view_it_on" AppName}}</a>
         </td></tr></table>
         <table width="100%" cellpadding="0" cellspacing="0" border="0" style="border:1px solid #d4c4a8;background:#f5ede0;border-radius:8px;"><tr><td style="padding:14px 16px;border-radius:8px;">
           <p style="margin:0 0 6px;font-size:12px;color:#8c7a6e;font-style:italic;">{{.locale.Tr "mail.link_not_working_do_paste"}}</p>
diff --git a/themes/terra/mail/repo/issue/default.tmpl b/themes/terra/mail/repo/issue/default.tmpl
index 962b330..cdb4ba6 100644
--- a/themes/terra/mail/repo/issue/default.tmpl
+++ b/themes/terra/mail/repo/issue/default.tmpl
@@ -32,9 +32,9 @@
       <tr><td class="resp-pad" style="padding:16px 32px 24px;color:#5c4030;">
         <p style="margin:0 0 8px;font-size:15px;line-height:1.8;color:#6b5040;">{{if .IsMention}}<p>{{.locale.Tr "mail.issue.x_mentioned_you" .Doer.Name}}</p>{{end}}{{if eq .ActionName "push"}}<p>{{if .Comment.IsForcePush}}{{$oldCommitUrl := printf "%s/commit/%s" .Comment.Issue.PullRequest.BaseRepo.HTMLURL .Comment.OldCommit}}{{$oldShortSha := ShortSha .Comment.OldCommit}}{{$oldCommitLink := HTMLFormat "<a href=\047%[1]s\047>%[2]s</a>" $oldCommitUrl $oldShortSha}}{{$newCommitUrl := printf "%s/commit/%s" .Comment.Issue.PullRequest.BaseRepo.HTMLURL .Comment.NewCommit}}{{$newShortSha := ShortSha .Comment.NewCommit}}{{$newCommitLink := HTMLFormat "<a href=\047%[1]s\047>%[2]s</a>" $newCommitUrl $newShortSha}}{{.locale.Tr "mail.issue.action.force_push" .Doer.Name .Comment.Issue.PullRequest.HeadBranch $oldCommitLink $newCommitLink}}{{else}}{{.locale.TrN (len .Comment.Commits) "mail.issue.action.push_1" "mail.issue.action.push_n" .Doer.Name .Comment.Issue.PullRequest.HeadBranch (len .Comment.Commits)}}{{end}}</p>{{end}}<p>{{if eq .ActionName "close"}}{{.locale.Tr "mail.issue.action.close" .Doer.Name .Issue.Index}}{{else if eq .ActionName "reopen"}}{{.locale.Tr "mail.issue.action.reopen" .Doer.Name .Issue.Index}}{{else if eq .ActionName "merge"}}{{.locale.Tr "mail.issue.action.merge" .Doer.Name .Issue.Index .Issue.PullRequest.BaseBranch}}{{else if eq .ActionName "approve"}}{{.locale.Tr "mail.issue.action.approve" .Doer.Name}}{{else if eq .ActionName "reject"}}{{.locale.Tr "mail.issue.action.reject" .Doer.Name}}{{else if eq .ActionName "review"}}{{.locale.Tr "mail.issue.action.review" .Doer.Name}}{{else if eq .ActionName "review_dismissed"}}{{.locale.Tr "mail.issue.action.review_dismissed" .Doer.Name .Comment.Review.Reviewer.Name}}{{else if eq .ActionName "ready_for_review"}}{{.locale.Tr "mail.issue.action.ready_for_review" .Doer.Name}}{{end}}{{- if eq .Body ""}}{{if eq .ActionName "new"}}{{.locale.Tr "mail.issue.action.new" .Doer.Name .Issue.Index}}{{end}}{{else}}{{.Body}}{{end -}}</p>{{- range .ReviewComments}}<hr><p>{{$.locale.Tr "mail.issue.in_tree_path" .TreePath}}</p><pre>{{.Patch}}</pre><div>{{.RenderedContent}}</div>{{end -}}{{if eq .ActionName "push"}}<ul>{{range .Comment.Commits}}<li><a href="{{$.Comment.Issue.PullRequest.BaseRepo.HTMLURL}}/commit/{{.ID}}">{{ShortSha .ID.String}}</a> - {{.MessageTitle}}</li>{{end}}</ul>{{end}}</p>
         <p style="margin:0 0 24px;font-size:14px;line-height:1.8;color:#8c7a6e;font-style:italic;"></p>
-        
+
         <table border="0" cellpadding="0" cellspacing="0" width="100%" style="margin:0 0 28px;"><tr><td>
-          <a href="{{.Link}}" class="resp-btn" style="display:inline-block;padding:14px 38px;font-size:15px;font-weight:600;color:#fff;text-decoration:none;background:#c67b5c;border-radius:24px;letter-spacing:0.3px;">Activate Your Account</a>
+          <a href="{{.Link}}" class="resp-btn" style="display:inline-block;padding:14px 38px;font-size:15px;font-weight:600;color:#fff;text-decoration:none;background:#c67b5c;border-radius:24px;letter-spacing:0.3px;">{{.locale.Tr "mail.view_it_on" AppName}}</a>{{if .CanReply}}&nbsp;{{.locale.Tr "mail.reply"}}{{end}}
         </td></tr></table>
         <table width="100%" cellpadding="0" cellspacing="0" border="0" style="border:1px solid #d4c4a8;background:#f5ede0;border-radius:8px;"><tr><td style="padding:14px 16px;border-radius:8px;">
           <p style="margin:0 0 6px;font-size:12px;color:#8c7a6e;font-style:italic;">{{.locale.Tr "mail.link_not_working_do_paste"}}</p>
diff --git a/themes/terra/mail/repo/release.tmpl b/themes/terra/mail/repo/release.tmpl
index 5bb87ed..9cac088 100644
--- a/themes/terra/mail/repo/release.tmpl
+++ b/themes/terra/mail/repo/release.tmpl
@@ -32,11 +32,11 @@
       <tr><td class="resp-pad" style="padding:16px 32px 24px;color:#5c4030;">
         <p style="margin:0 0 8px;font-size:15px;line-height:1.8;color:#6b5040;">{{$release_url := HTMLFormat "<a href=\047%s\047>%s</a>" .Release.HTMLURL .Release.TagName}}{{$repo_url := HTMLFormat "<a href=\047%s\047>%s</a>" .Release.Repo.HTMLURL .Release.Repo.FullName}}{{.locale.Tr "mail.release.new.text" .Release.Publisher.Name $release_url $repo_url}}
 <h4>{{.locale.Tr "mail.release.title" .Release.Title}}</h4>
-{{if .Release.RenderedNote}}<div>{{.Release.RenderedNote}}</div>{{end}}
+{{if .Release.RenderedNote}}{{.locale.Tr "mail.release.note"}}<br><div>{{.Release.RenderedNote}}</div>{{end}}
 <p>{{.locale.Tr "mail.release.downloads"}}</p>
 <ul>{{if not .DisableDownloadSourceArchives}}<li><a href="{{.Release.Repo.HTMLURL}}/archive/{{.Release.TagName | PathEscapeSegments}}.zip">{{.locale.Tr "mail.release.download.zip"}}</a></li><li><a href="{{.Release.Repo.HTMLURL}}/archive/{{.Release.TagName | PathEscapeSegments}}.tar.gz">{{.locale.Tr "mail.release.download.targz"}}</a></li>{{end}}{{if .Release.Attachments}}{{range .Release.Attachments}}<li><a href="{{.DownloadURL}}">{{.Name}} ({{.Size | FileSize}})</a></li>{{end}}{{end}}</ul></p>
         <p style="margin:0 0 24px;font-size:14px;line-height:1.8;color:#8c7a6e;font-style:italic;"></p>
-        
+
         <table border="0" cellpadding="0" cellspacing="0" width="100%" style="margin:0 0 28px;"><tr><td>
           <a href="{{.Link}}" class="resp-btn" style="display:inline-block;padding:14px 38px;font-size:15px;font-weight:600;color:#fff;text-decoration:none;background:#c67b5c;border-radius:24px;letter-spacing:0.3px;">{{.locale.Tr "mail.view_it_on" AppName}}</a>
         </td></tr></table>
diff --git a/themes/terra/mail/repo/transfer.tmpl b/themes/terra/mail/repo/transfer.tmpl
index 2b65c38..1478ea5 100644
--- a/themes/terra/mail/repo/transfer.tmpl
+++ b/themes/terra/mail/repo/transfer.tmpl
@@ -32,9 +32,9 @@
       <tr><td class="resp-pad" style="padding:16px 32px 24px;color:#5c4030;">
         <p style="margin:0 0 8px;font-size:15px;line-height:1.8;color:#6b5040;">{{$url := HTMLFormat "<a href=\047%[1]s\047>%[2]s</a>" .Link .Repo}}{{.Subject}}. {{.locale.Tr "mail.repo.transfer.body" $url}}</p>
         <p style="margin:0 0 24px;font-size:14px;line-height:1.8;color:#8c7a6e;font-style:italic;"></p>
-        
+
         <table border="0" cellpadding="0" cellspacing="0" width="100%" style="margin:0 0 28px;"><tr><td>
-          <a href="{{.Link}}" class="resp-btn" style="display:inline-block;padding:14px 38px;font-size:15px;font-weight:600;color:#fff;text-decoration:none;background:#c67b5c;border-radius:24px;letter-spacing:0.3px;">Activate Your Account</a>
+          <a href="{{.Link}}" class="resp-btn" style="display:inline-block;padding:14px 38px;font-size:15px;font-weight:600;color:#fff;text-decoration:none;background:#c67b5c;border-radius:24px;letter-spacing:0.3px;">{{.locale.Tr "mail.view_it_on" AppName}}</a>
         </td></tr></table>
         <table width="100%" cellpadding="0" cellspacing="0" border="0" style="border:1px solid #d4c4a8;background:#f5ede0;border-radius:8px;"><tr><td style="padding:14px 16px;border-radius:8px;">
           <p style="margin:0 0 6px;font-size:12px;color:#8c7a6e;font-style:italic;">{{.locale.Tr "mail.link_not_working_do_paste"}}</p>