Properly parse mail address
Merge remote-tracking branch 'chiiph/bug/properly_parse_addr' into develop