diff --git a/templates/mail/repo/issue/default.tmpl b/templates/mail/repo/issue/default.tmpl
index 44cdc563ad6..2d217a87f1d 100644
--- a/templates/mail/repo/issue/default.tmpl
+++ b/templates/mail/repo/issue/default.tmpl
@@ -63,19 +63,19 @@
 				<div>{{.RenderedContent}}</div>
 			</div>
 		{{end -}}
-		{{if eq .ActionName "push"}}
-			<ul>
-			{{$repoURL := $.Comment.Issue.PullRequest.BaseRepo.HTMLURL}}
-			{{range $commit := $.Comment.Commits}}
-				<li>
-					<a href="{{$repoURL}}/commit/{{$commit.ID}}">
-						{{ShortSha $commit.ID.String}}
-					</a>  -  {{$commit.MessageTitle}}
-				</li>
-			{{end}}
-			</ul>
-		{{end}}
 	</p>
+	{{if eq .ActionName "push"}}
+		<ul>
+		{{$repoURL := $.Comment.Issue.PullRequest.BaseRepo.HTMLURL}}
+		{{range $commit := $.Comment.Commits}}
+			<li>
+				<a href="{{$repoURL}}/commit/{{$commit.ID}}">
+					{{ShortSha $commit.ID.String}}
+				</a>  -  {{$commit.MessageTitle}}
+			</li>
+		{{end}}
+		</ul>
+	{{end}}
 	<div style="font-size:small; color:#666;">
 		<p>
 			---
diff --git a/templates/mail/repo/release.tmpl b/templates/mail/repo/release.tmpl
index 9e7295d370b..bd4a5253225 100644
--- a/templates/mail/repo/release.tmpl
+++ b/templates/mail/repo/release.tmpl
@@ -29,26 +29,26 @@
 		---
 		<br>
 		{{.locale.Tr "mail.release.downloads"}}
-		<ul>
-			{{if not .DisableDownloadSourceArchives}}
-			<li>
-				<a href="{{.Release.Repo.HTMLURL}}/archive/{{.Release.TagName | PathEscapeSegments}}.zip" rel="nofollow"><strong>{{.locale.Tr "mail.release.download.zip"}}</strong></a>
-			</li>
-			<li>
-				<a href="{{.Release.Repo.HTMLURL}}/archive/{{.Release.TagName | PathEscapeSegments}}.tar.gz" rel="nofollow"><strong>{{.locale.Tr "mail.release.download.targz"}}</strong></a>
-			</li>
-			{{end}}
-			{{if .Release.Attachments}}
-				{{range .Release.Attachments}}
-					<li>
-						<a target="_blank" href="{{.DownloadURL}}">
-							<strong>{{.Name}} ({{.Size | FileSize}})</strong>
-						</a>
-					</li>
-				{{end}}
-			{{end}}
-		</ul>
 	</p>
+	<ul>
+		{{if not .DisableDownloadSourceArchives}}
+		<li>
+			<a href="{{.Release.Repo.HTMLURL}}/archive/{{.Release.TagName | PathEscapeSegments}}.zip" rel="nofollow"><strong>{{.locale.Tr "mail.release.download.zip"}}</strong></a>
+		</li>
+		<li>
+			<a href="{{.Release.Repo.HTMLURL}}/archive/{{.Release.TagName | PathEscapeSegments}}.tar.gz" rel="nofollow"><strong>{{.locale.Tr "mail.release.download.targz"}}</strong></a>
+		</li>
+		{{end}}
+		{{if .Release.Attachments}}
+			{{range .Release.Attachments}}
+				<li>
+					<a target="_blank" href="{{.DownloadURL}}">
+						<strong>{{.Name}} ({{.Size | FileSize}})</strong>
+					</a>
+				</li>
+			{{end}}
+		{{end}}
+	</ul>
 	<div style="font-size:small; color:#666;">
 		<p>
 			---