Merge ~hloeung/review-tools:master into review-tools:master

[Haw Loeung]

[Alex Murray (alexmurray)]

Thanks, LGTM!

review: Approve

diff --git a/reviewtools/email.py b/reviewtools/email.py
index 9f97129..ad0a621 100644
--- a/reviewtools/email.py
+++ b/reviewtools/email.py
@@ -20,7 +20,7 @@ import smtplib
 import sys
 
 # The From address for all emails
-email_from_addr = "Snap Store <[e-mail]>"
+email_from_addr = "Snap Store <[e-mail]>"
 
 # Send via local SMTP server
 email_server = "localhost"
@@ -85,6 +85,8 @@ def send(email_to_addr, subj, body, bcc=None):
 
         if "RT_EMAIL_SERVER" in os.environ:
             email_server = os.environ["RT_EMAIL_SERVER"]
+        email_server_user = os.environ.get("RT_EMAIL_SERVER_USER")
+        email_server_password = os.environ.get("RT_EMAIL_SERVER_PASSWORD")
 
         if (
             "RT_EMAIL_NOPROMPT" not in os.environ
@@ -109,7 +111,11 @@ def send(email_to_addr, subj, body, bcc=None):
         msg["To"] = email_to_addr
         if bcc is not None:
             msg["Bcc"] = bcc
-        s = smtplib.SMTP(email_server)
+        if email_server_user and email_server_password:
+            s = smtplib.SMTP_SSL(email_server)
+            s.login(email_server_user, email_server_password)
+        else:
+            s = smtplib.SMTP(email_server)
         s.send_message(msg)
         s.quit()