Fix email views