Delete invited user doesn't work (special case)

Ok, this is for perfectionists! For most users this wouldn't be an issue.

How to simulate this:

1. Invite a user with a email with '+' in it. This according to rfcs are valid. So something like user+1@email.com is a perfectly valid email id
2. Now try deleting this invite
3. You'll get a message saying this is deleted, but the email will still be there
4. This is because, + in urlencode is translated as space thus the above email will be searched as user1@email.com which will fail in the sql query

Enough babble, where's the fix?

function invite_delete($email) {
global $user;

//RD: when email has + in it, that is equal to space in an encoded
//url. urlencode converts space to +
//rawurldecode does not convert + back to space thus preserving +
$email = urlencode($email);
$email = rawurldecode($email);

if ($email){

This should fix the problem. If the email doesn't have a + then this isn't an issue at all.