Fix e-mail problems

- Stricter e-mail regexp.