Tweaking email regexp, also removing need for regexp on safe chars