More work on SMTP

Change-Id: I62e5a45ba268be34c4bd444070c8b8a8e32a3e02