integrating c00eae724e358e17eef2e0ad885fbb4aadba2f55 which provides a more saner default for handling email in development