diff --git a/email_handler.py b/email_handler.py
index 3f36eabf..525a30f9 100644
--- a/email_handler.py
+++ b/email_handler.py
@@ -801,7 +801,8 @@ def forward_email_to_mailbox(
     add_or_replace_header(msg, headers.SL_DIRECTION, "Forward")
 
     msg[headers.SL_EMAIL_LOG_ID] = str(email_log.id)
-    msg[headers.SL_ENVELOPE_FROM] = envelope.mail_from
+    if user.include_header_email_header:
+        msg[headers.SL_ENVELOPE_FROM] = envelope.mail_from
     # when an alias isn't in the To: header, there's no way for users to know what alias has received the email
     msg[headers.SL_ENVELOPE_TO] = alias.email