Bugfix #719: Updated regex for x.x.x@ like emails, along with tests