Use a better regex for email -- See #2378
Merge branch 'michel_2378_email' into next