fixes #608

Better email stability