Merge "Fix patchset level comment link"
diff --git a/resources/com/google/gerrit/server/mail/Comment.soy b/resources/com/google/gerrit/server/mail/Comment.soy
index 1eb016b..fc92b31 100644
--- a/resources/com/google/gerrit/server/mail/Comment.soy
+++ b/resources/com/google/gerrit/server/mail/Comment.soy
@@ -41,7 +41,7 @@
   {for $group in $commentFiles}
     // Insert a space before the newline so that Gmail does not mistakenly link
     // the following line with the file link. See issue 9201.
-    {$group.link}{sp}{\n}
+    {if $group.link}{$group.link}{sp}{/if}{\n}
     {$group.title}:{\n}
     {\n}