Fix one of the previous commit return style and simplify a MailAddress
operator function(remove redundant else).

No functional change.