emails notification fixes