1 files changed, 7 insertions, 7 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmail.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmail.java
index caa441dfce..997bc03da6 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmail.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmail.java
@@ -15,6 +15,7 @@
 package com.google.gerrit.server.mail;
 
 import com.google.common.collect.Sets;
+import com.google.gerrit.common.errors.EmailException;
 import com.google.gerrit.reviewdb.client.Account;
 import com.google.gerrit.reviewdb.client.UserIdentity;
 import com.google.gerrit.server.account.AccountState;
@@ -59,14 +60,11 @@ public abstract class OutgoingEmail {
   protected VelocityContext velocityContext;
 
   protected final EmailArguments args;
-  private final String anonymousCowardName;
   protected Account.Id fromId;
 
 
-  protected OutgoingEmail(EmailArguments ea, final String anonymousCowardName,
-      final String mc) {
+  protected OutgoingEmail(EmailArguments ea, String mc) {
     args = ea;
-    this.anonymousCowardName = anonymousCowardName;
     messageClass = mc;
     headers = new LinkedHashMap<String, EmailHeader>();
   }
@@ -235,7 +233,7 @@ public abstract class OutgoingEmail {
   /** Lookup a human readable name for an account, usually the "full name". */
   protected String getNameFor(final Account.Id accountId) {
     if (accountId == null) {
-      return anonymousCowardName;
+      return args.anonymousCowardName;
     }
 
     final Account userAccount = args.accountCache.get(accountId).getAccount();
@@ -244,7 +242,7 @@ public abstract class OutgoingEmail {
       name = userAccount.getPreferredEmail();
     }
     if (name == null) {
-      name = anonymousCowardName + " #" + accountId;
+      name = args.anonymousCowardName + " #" + accountId;
     }
     return name;
   }
@@ -263,7 +261,7 @@ public abstract class OutgoingEmail {
       return email;
 
     } else /* (name == null && email == null) */{
-      return anonymousCowardName + " #" + accountId;
+      return args.anonymousCowardName + " #" + accountId;
     }
   }
 
@@ -332,6 +330,8 @@ public abstract class OutgoingEmail {
             case CC:
               ((EmailHeader.AddressList) headers.get(HDR_CC)).add(addr);
               break;
+            case BCC:
+              break;
           }
         }
       } else {