diff --git a/templates/repo/diff/comments.tmpl b/templates/repo/diff/comments.tmpl
index 47a4502efdad..f47dad807e73 100644
--- a/templates/repo/diff/comments.tmpl
+++ b/templates/repo/diff/comments.tmpl
@@ -37,7 +37,7 @@
{{ctx.Locale.Tr "repo.issues.review.outdated"}}
{{end}}
- {{if and .Review}}
+ {{if .Review}}
{{if eq .Review.Type 0}}
{{ctx.Locale.Tr "repo.issues.review.pending"}}
diff --git a/templates/repo/diff/conversation.tmpl b/templates/repo/diff/conversation.tmpl
index aaeac3c550db..507f17fd94b7 100644
--- a/templates/repo/diff/conversation.tmpl
+++ b/templates/repo/diff/conversation.tmpl
@@ -1,66 +1,72 @@
-{{$resolved := (index .comments 0).IsResolved}}
-{{$invalid := (index .comments 0).Invalidated}}
-{{$resolveDoer := (index .comments 0).ResolveDoer}}
-{{$isNotPending := (not (eq (index .comments 0).Review.Type 0))}}
-{{$referenceUrl := printf "%s#%s" $.Issue.Link (index .comments 0).HashTag}}
-
- {{if $resolved}}
-