diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 8ddd8e40d6c6..1cd4e6a1d03d 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -365,6 +365,7 @@ password_pwned_err = Could not complete request to HaveIBeenPwned
 
 [mail]
 view_it_on = View it on %s
+reply = or reply to this email directly
 link_not_working_do_paste = Not working? Try copying and pasting it to your browser.
 hi_user_x = Hi <b>%s</b>,
 
diff --git a/services/mailer/mail.go b/services/mailer/mail.go
index 6af4ed249c5b..7c7ad54714ce 100644
--- a/services/mailer/mail.go
+++ b/services/mailer/mail.go
@@ -274,6 +274,7 @@ func composeIssueCommentMessages(ctx *mailCommentContext, lang string, recipient
 		"ActionName":      actName,
 		"ReviewComments":  reviewComments,
 		"Language":        locale.Language(),
+		"CanReply":        setting.IncomingEmail.Enabled && commentType != issues_model.CommentTypePullRequestPush,
 		// helper
 		"locale":    locale,
 		"Str2html":  templates.Str2html,
diff --git a/templates/mail/issue/default.tmpl b/templates/mail/issue/default.tmpl
index d9f7aff4cce3..64dbb3df681e 100644
--- a/templates/mail/issue/default.tmpl
+++ b/templates/mail/issue/default.tmpl
@@ -84,7 +84,7 @@
 	<p>
 		---
 		<br>
-		<a href="{{.Link}}">{{.locale.Tr "mail.view_it_on" AppName}}</a>.
+		<a href="{{.Link}}">{{.locale.Tr "mail.view_it_on" AppName}}</a>{{if .CanReply}} {{.locale.Tr "mail.reply"}}{{end}}.
 	</p>
 	</div>
 </body>