Fixes bug 848458 - Fixed issues with invalid email addresses and unicode...

... characters.

This is a PR against the **stage** branch. It needs to go into today's release. 

@lonnen r?