Fix issue #7150 - better email regex