(FR #1015) Spaces in Emails are Actually '+'

Because URL decode is intelligent like that.

Change-Id: I1741abf21294a7981a94ce0008b9e48c221304e5