Final fix for NB#137187, problems parsing email addresses