Changes to the email daemon to handle counting problems.