diff --git a/django_mailbox/models.py b/django_mailbox/models.py
index 7f05b98..e549841 100644
--- a/django_mailbox/models.py
+++ b/django_mailbox/models.py
@@ -511,7 +511,7 @@ class Message(models.Model):
         pre-set it.
 
         """
-        if not self.from_email:
+        if not message.from_email:
             if self.mailbox.from_email:
                 message.from_email = self.mailbox.from_email
             else: