More work on emailAdapter (wip)