diff --git a/app/models.py b/app/models.py
index 9b423db0..1a597a62 100644
--- a/app/models.py
+++ b/app/models.py
@@ -537,6 +537,7 @@ class ForwardEmail(db.Model, ModelMixin):
         db.ForeignKey(GenEmail.id, ondelete="cascade"), nullable=False
     )
 
+    # used to be envelope header, should be mail header from instead
     website_email = db.Column(db.String(128), nullable=False)
 
     # when user clicks on "reply", they will reply to this address.
diff --git a/email_handler.py b/email_handler.py
index 5e01fdef..9f602995 100644
--- a/email_handler.py
+++ b/email_handler.py
@@ -88,7 +88,7 @@ class MailHandler:
 
         user_email = gen_email.user.email
 
-        website_email = envelope.mail_from
+        website_email = msg["From"]
 
         forward_email = ForwardEmail.get_by(
             gen_email_id=gen_email.id, website_email=website_email