Change the e-mail handler to do a map of messages
Remove extra print from e-mail checker