mail notification fixes