Email bug hotfix