--- mod_mail.py.ori     2006-03-13 00:56:32.000000000 -0700
+++ mod_mail.py 2006-03-13 01:57:08.000000000 -0700
@@ -33,7 +33,10 @@
                        myrecipient = mysettings["PORTAGE_ELOG_MAILURI"]
        try:
                mymessage = email.Message.Message()
-               mymessage.set_unixfrom("portage")
+               if mymailhost != "localhost":
+                       mymessage.set_unixfrom("portage@"+socket.getfqdn())
+               else:
+                       mymessage.set_unixfrom("portage")
                mymessage.set_payload(fulltext)
                mymessage["To"] = myrecipient
                mymessage["Subject"] = "[portage] Ebuild log for %s" % cpv
@@ -45,7 +48,10 @@
                        myconn = smtplib.SMTP(mymailhost, mymailport)
                if mymailuser != "" and mymailpasswd != "":
                        myconn.login(mymailuser, mymailpasswd)
-               myconn.sendmail("portage", myrecipient, mymessage.as_string())
+               if mymailhost != "localhost":
+                       myconn.sendmail("portage@"+socket.getfqdn(), myrecipient, mymessage.as_string())
+               else:
+                       myconn.sendmail("portage", myrecipient, mymessage.as_string())
                myconn.quit()
        except smtplib.SMTPException, e:
                raise portage_exception.PortageException("!!! An error occured while trying to send logmail:\n"+str(e))