--- portage-2.1.2/pym/portage_mail.py	2006-08-01 13:43:12.000000000 -0400
+++ portage-2.1.2/pym/portage_mail.py	2007-07-01 05:01:25.000000000 -0400
@@ -74,7 +74,9 @@ 
 		try:
 			if int(mymailport) > 100000:
 				myconn = smtplib.SMTP(mymailhost, int(mymailport) - 100000)
+				myconn.ehlo()
 				myconn.starttls()
+				myconn.ehlo()
 			else:
 				myconn = smtplib.SMTP(mymailhost, mymailport)
 			if mymailuser != "" and mymailpasswd != "":
@@ -84,6 +86,7 @@ 
 		except smtplib.SMTPException, e:
 			raise portage_exception.PortageException("!!! An error occured while trying to send logmail:\n"+str(e))
 		except socket.error, e:
-			raise portage_exception.PortageException("!!! A network error occured while trying to send logmail:\n"+str(e)+"\nSure you configured PORTAGE_ELOG_MAILURI correctly?")
+			if e[0] != 8:
+				raise portage_exception.PortageException("!!! A network error occured while trying to send logmail:\n"+str(e)+"\nSure you configured PORTAGE_ELOG_MAILURI correctly?")
 	return