fix email encoding problems for mails with '+' - By OSF

fix email encoding problems for mails with '+' - By OSF