Merge "Added OutgoingEmailValidationListener"