smtp draft overhaul
smtp draft overhaul