From 24138d1dc7af8c964946815ab9634b3d336026c2 Mon Sep 17 00:00:00 2001 From: Adam Dobrawy Date: Sat, 14 Mar 2015 18:23:19 +0100 Subject: [PATCH] During reply update from_email only if not set --- django_mailbox/models.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/django_mailbox/models.py b/django_mailbox/models.py index 0329322..7e93c14 100644 --- a/django_mailbox/models.py +++ b/django_mailbox/models.py @@ -498,10 +498,11 @@ class Message(models.Model): pre-set it. """ - if self.mailbox.from_email: - message.from_email = self.mailbox.from_email - else: - message.from_email = settings.DEFAULT_FROM_EMAIL + if not getattr(message, 'from_email', None): + if self.mailbox.from_email: + message.from_email = self.mailbox.from_email + else: + message.from_email = settings.DEFAULT_FROM_EMAIL message.extra_headers['Message-ID'] = make_msgid() message.extra_headers['Date'] = formatdate() message.extra_headers['In-Reply-To'] = self.message_id