More work on the email daemon.