Keyring: use regex for email check. Fix exception if userid does not contain an email address.
Merge branch 'keyring_emailcheck' into firefox_v3