Fixed bug #24 "Bad handling of emails with '+' character"