Move more methods into the mail adapter

@deiferni 

Tests pass locally :smile: