diff --git a/java/com/google/gerrit/plugins/checks/email/CombinedCheckStateUpdatedSender.java b/java/com/google/gerrit/plugins/checks/email/CombinedCheckStateUpdatedSender.java
index 4fb9beb..584827c 100644
--- a/java/com/google/gerrit/plugins/checks/email/CombinedCheckStateUpdatedSender.java
+++ b/java/com/google/gerrit/plugins/checks/email/CombinedCheckStateUpdatedSender.java
@@ -57,15 +57,6 @@
     super(args, "combinedCheckStateUpdate", ChangeEmail.newChangeData(args, project, changeId));
   }
 
-  @Override
-  protected void init() throws EmailException {
-    super.init();
-
-    ccAllApprovals();
-    bccStarredBy();
-    includeWatchers(NotifyType.ALL_COMMENTS);
-  }
-
   public void setCombinedCheckState(
       CombinedCheckState oldCombinedCheckState, CombinedCheckState newCombinedCheckState) {
     this.oldCombinedCheckState = requireNonNull(oldCombinedCheckState);
@@ -90,8 +81,8 @@
   }
 
   @Override
-  protected void setupSoyContext() {
-    super.setupSoyContext();
+  protected void populateEmailContent() throws EmailException {
+    super.populateEmailContent();
 
     if (oldCombinedCheckState != null) {
       soyContext.put("oldCombinedCheckState", oldCombinedCheckState.name());
@@ -114,6 +105,10 @@
       }
       soyContext.put("allCheckers", allCheckersData);
     }
+
+    ccAllApprovals();
+    bccStarredBy();
+    includeWatchers(NotifyType.ALL_COMMENTS);
   }
 
   /**