diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/AbandonedHtml.soy b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/AbandonedHtml.soy
index e3b46134bf..c7d4699813 100644
--- a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/AbandonedHtml.soy
+++ b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/AbandonedHtml.soy
@@ -17,14 +17,13 @@
 {namespace com.google.gerrit.server.mail.template}
 
 /**
- * @param change
  * @param coverLetter
  * @param email
  * @param fromName
  */
 {template .AbandonedHtml autoescape="strict" kind="html"}
   <p>
-    {$fromName} abandoned <strong>{$change.subject}</strong>.
+    {$fromName} <strong>abandoned</strong> this change.
   </p>
 
   {if $email.changeUrl}
@@ -34,6 +33,6 @@
   {/if}
 
   {if $coverLetter}
-    {call .Pre}{param content: $coverLetter /}{/call}
+    <div style="white-space:pre-wrap">{$coverLetter}</div>
   {/if}
 {/template}
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/CommentHtml.soy b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/CommentHtml.soy
index 6dc37b8a53..21be41b6f9 100644
--- a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/CommentHtml.soy
+++ b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/CommentHtml.soy
@@ -17,7 +17,6 @@
 {namespace com.google.gerrit.server.mail.template}
 
 /**
- * @param change
  * @param commentFiles
  * @param coverLetter
  * @param email
@@ -44,7 +43,7 @@
   {/let}
 
   <p>
-    {$fromName} posted comments on <strong>{$change.subject}</strong>.
+    {$fromName} <strong>posted comments</strong> on this change.
   </p>
 
   {if $email.changeUrl}
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/DeleteReviewerHtml.soy b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/DeleteReviewerHtml.soy
index 6817fbd0bf..5faa411da5 100644
--- a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/DeleteReviewerHtml.soy
+++ b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/DeleteReviewerHtml.soy
@@ -17,19 +17,22 @@
 {namespace com.google.gerrit.server.mail.template}
 
 /**
- * @param change
- * @param coverLetter
  * @param email
  * @param fromName
  */
 {template .DeleteReviewerHtml autoescape="strict" kind="html"}
   <p>
-    {$fromName} removed{sp}
-    {foreach $reviewerName in $email.reviewerNames}
-      {if not isFirst($reviewerName)},{sp}{/if}
-      {$reviewerName}
-    {/foreach}{sp}
-    from <strong>{$change.subject}</strong>.
+    {$fromName}{sp}
+    <strong>
+      removed{sp}
+      {foreach $reviewerName in $email.reviewerNames}
+        {if not isFirst($reviewerName)}
+          {if isLast($reviewerName)}{sp}and{else},{/if}{sp}
+        {/if}
+        {$reviewerName}
+      {/foreach}
+    </strong>{sp}
+    from this change.
   </p>
 
   {if $email.changeUrl}
@@ -37,8 +40,4 @@
       {call .ViewChangeButton data="all" /}
     </p>
   {/if}
-
-  {if $coverLetter}
-    {call .Pre}{param content: $coverLetter /}{/call}
-  {/if}
 {/template}
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/DeleteVoteHtml.soy b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/DeleteVoteHtml.soy
index bfcd8d5efc..3d76ae2f40 100644
--- a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/DeleteVoteHtml.soy
+++ b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/DeleteVoteHtml.soy
@@ -17,14 +17,13 @@
 {namespace com.google.gerrit.server.mail.template}
 
 /**
- * @param change
  * @param coverLetter
  * @param email
  * @param fromName
  */
 {template .DeleteVoteHtml autoescape="strict" kind="html"}
   <p>
-    {$fromName} removed a vote from <strong>{$change.subject}</strong>.
+    {$fromName} <strong>removed a vote</strong> from this change.
   </p>
 
   {if $email.changeUrl}
@@ -34,6 +33,6 @@
   {/if}
 
   {if $coverLetter}
-    {call .Pre}{param content: $coverLetter /}{/call}
+    <div style="white-space:pre-wrap">{$coverLetter}</div>
   {/if}
 {/template}
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/MergedHtml.soy b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/MergedHtml.soy
index 257f522f1e..fa2b44d0a0 100644
--- a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/MergedHtml.soy
+++ b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/MergedHtml.soy
@@ -17,13 +17,12 @@
 {namespace com.google.gerrit.server.mail.template}
 
 /**
- * @param change
  * @param email
  * @param fromName
  */
 {template .MergedHtml autoescape="strict" kind="html"}
   <p>
-    {$fromName} merged <strong>{$change.subject}</strong>.
+    {$fromName} <strong>merged</strong> this change.
   </p>
 
   {if $email.changeUrl}
@@ -32,9 +31,9 @@
     </p>
   {/if}
 
-  {call .Pre}{param content: $email.changeDetail /}{/call}
+  <div style="white-space:pre-wrap">{$email.approvals}</div>
 
-  {call .Pre}{param content: $email.approvals /}{/call}
+  {call .Pre}{param content: $email.changeDetail /}{/call}
 
   {if $email.includeDiff}
     {call .Pre}{param content: $email.unifiedDiff /}{/call}
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/NewChangeHtml.soy b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/NewChangeHtml.soy
index 63d3462ebf..eef3a7e74d 100644
--- a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/NewChangeHtml.soy
+++ b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/NewChangeHtml.soy
@@ -17,7 +17,6 @@
 {namespace com.google.gerrit.server.mail.template}
 
 /**
- * @param change
  * @param email
  * @param fromName
  * @param patchSet
@@ -33,9 +32,9 @@
         {/if}
         {$reviewerName}
       {/foreach}{sp}
-      to review <strong>{$change.subject}</strong>.
+      to <strong>review</strong> this change.
     {else}
-      {$fromName} uploaded <strong>{$change.subject}</strong> for review.
+      {$fromName} uploaded this change for <strong>review</strong>.
     {/if}
   </p>
 
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ReplacePatchSetHtml.soy b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ReplacePatchSetHtml.soy
index 0163732201..0d19f3f3c4 100644
--- a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ReplacePatchSetHtml.soy
+++ b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ReplacePatchSetHtml.soy
@@ -17,7 +17,6 @@
 {namespace com.google.gerrit.server.mail.template}
 
 /**
- * @param change
  * @param email
  * @param fromName
  * @param patchSet
@@ -25,8 +24,8 @@
  */
 {template .ReplacePatchSetHtml autoescape="strict" kind="html"}
   <p>
-    {$fromName} uploaded patch set #{$patchSet.patchSetId} to{sp}
-    <strong>{$change.subject}</strong>.
+    {$fromName} <strong>uploaded patch set #{$patchSet.patchSetId}</strong>{sp}
+    to this change.
   </p>
 
   {if $email.changeUrl}
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/RestoredHtml.soy b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/RestoredHtml.soy
index 525c6d37d9..ea4f6154f1 100644
--- a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/RestoredHtml.soy
+++ b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/RestoredHtml.soy
@@ -17,14 +17,12 @@
 {namespace com.google.gerrit.server.mail.template}
 
 /**
- * @param change
- * @param coverLetter
  * @param email
  * @param fromName
  */
 {template .RestoredHtml autoescape="strict" kind="html"}
   <p>
-    {$fromName} restored <strong>{$change.subject}</strong>.
+    {$fromName} <strong>restored</strong> this change.
   </p>
 
   {if $email.changeUrl}
@@ -32,8 +30,4 @@
       {call .ViewChangeButton data="all" /}
     </p>
   {/if}
-
-  {if $coverLetter}
-    {call .Pre}{param content: $coverLetter /}{/call}
-  {/if}
 {/template}
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/RevertedHtml.soy b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/RevertedHtml.soy
index 9770f09cb4..d6407e7d27 100644
--- a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/RevertedHtml.soy
+++ b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/RevertedHtml.soy
@@ -17,14 +17,12 @@
 {namespace com.google.gerrit.server.mail.template}
 
 /**
- * @param change
- * @param coverLetter
  * @param email
  * @param fromName
  */
 {template .RevertedHtml autoescape="strict" kind="html"}
   <p>
-    {$fromName} reverted the change: <strong>{$change.subject}</strong>.
+    {$fromName} <strong>reverted</strong> this change.
   </p>
 
   {if $email.changeUrl}
@@ -32,8 +30,4 @@
       {call .ViewChangeButton data="all" /}
     </p>
   {/if}
-
-  {if $coverLetter}
-    {call .Pre}{param content: $coverLetter /}{/call}
-  {/if}
 {/template}