X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/28bb6b1036f980f09b0e7c7d9516983488566e1e..e25a52bd2e384683c99b6e57647b829dba3bf5a2:/forum/utils/mail.py

diff --git a/forum/utils/mail.py b/forum/utils/mail.py
index 8016b00..4ab2a69 100644
--- a/forum/utils/mail.py
+++ b/forum/utils/mail.py
@@ -33,7 +33,7 @@ def create_connection():
     connection = SMTP(str(settings.EMAIL_HOST), str(settings.EMAIL_PORT),
                           local_hostname=DNS_NAME.get_fqdn())
 
-    if (bool(settings.EMAIL_USE_TLS)):
+    if bool(settings.EMAIL_USE_TLS):
         connection.ehlo()
         connection.starttls()
         connection.ehlo()
@@ -52,6 +52,8 @@ def create_and_send_mail_messages(messages):
     sender.append('<%s>' % unicode(settings.DEFAULT_FROM_EMAIL))
     sender = u'%s <%s>' % (unicode(settings.APP_SHORT_NAME), unicode(settings.DEFAULT_FROM_EMAIL))
 
+    reply_to = unicode(settings.DEFAULT_REPLY_TO_EMAIL)
+
     try:
         connection = None
 
@@ -71,6 +73,9 @@ def create_and_send_mail_messages(messages):
             to.append('<%s>' % recipient.email)
             msgRoot['To'] = to
 
+            if reply_to:
+                msgRoot['Reply-To'] = reply_to
+
             msgRoot.preamble = 'This is a multi-part message from %s.' % unicode(settings.APP_SHORT_NAME).encode('utf8')
 
             msgAlternative = MIMEMultipart('alternative')
@@ -94,12 +99,15 @@ def create_and_send_mail_messages(messages):
                 logging.error("Couldn't send mail using the sendmail method: %s" % e)
                 try:
                     connection.quit()
-                    connection = None
-                except Exception:
+                except Exception, e:
+                    logging.error(e)
+                finally:
                     connection = None
 
         try:
             connection.quit()
+        except AttributeError:
+            pass
         except socket.sslerror:
             connection.close()
     except Exception, e: