Additions to email feature