From b720b05bf72b9736128b4ffa1358dd2eb6335ac1 Mon Sep 17 00:00:00 2001 From: tonio Date: Fri, 12 Nov 2010 21:54:12 +0100 Subject: [PATCH] #84: Put a valid RFC822 mailbox in the FROM: header when sending an email Just grab the name associated with the sender address. --- extensions/webmail/views.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/extensions/webmail/views.py b/extensions/webmail/views.py index b0f4e1ebf..92378d5be 100644 --- a/extensions/webmail/views.py +++ b/extensions/webmail/views.py @@ -285,8 +285,12 @@ def send_mail(request, withctx=False, origmsg=None, posturl=None): else: msg = MIMEText(body.encode(charset), _subtype=subtype) + mb = Mailbox.objects.get(full_address=request.POST["from_"]) msg["Subject"] = request.POST["subject"] - msg["From"] = request.POST["from_"] + if mb is None: + msg["From"] = request.POST["from_"] + else: + msg["From"] = "%s <%s>" % (mb.name, request.POST["from_"]) msg["To"] = request.POST["to"] msg["Message-ID"] = make_msgid() msg["User-Agent"] = "Modoboa"