Split out email bits to new method. Cleanup.