Merge "Insert space to prevent overagressive email linkification"

1 files changed, 9 insertions, 2 deletions

diff --git a/resources/com/google/gerrit/server/mail/Comment.soy b/resources/com/google/gerrit/server/mail/Comment.soy
index 31704483ff..f9a11cdc5b 100644
--- a/resources/com/google/gerrit/server/mail/Comment.soy
+++ b/resources/com/google/gerrit/server/mail/Comment.soy
@@ -39,7 +39,9 @@
   {/if}
 
   {for $group in $commentFiles}
-    {$group.link}{\n}
+    // 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}
     {$group.title}:{\n}
     {\n}
 
@@ -53,7 +55,12 @@
         {if isFirst($line)}
           {if $comment.startLine != 0}
             {$comment.link}
-          {/if}{\n}
+          {/if}
+
+          // Insert a space before the newline so that Gmail does not mistakenly
+          // link the following line with the file link. See issue 9201.
+          {sp}{\n}
+
           {$comment.linePrefix}
         {else}
           {$comment.linePrefixEmpty}