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 0442e2383c..75f30b2b3f 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
@@ -494,9 +494,10 @@ public abstract class OutgoingEmail {
         j.remove();
       }
     }
-    for (EmailHeader hdr : headers.values()) {
-      if (hdr instanceof AddressList) {
-        ((AddressList) hdr).remove(fromEmail);
+    for (Map.Entry<String, EmailHeader> entry : headers.entrySet()) {
+      // Don't remove fromEmail from the "From" header though!
+      if (entry.getValue() instanceof AddressList && entry.getKey() != "From") {
+        ((AddressList) entry.getValue()).remove(fromEmail);
       }
     }
   }