Wrong login redirect after enbling clean urls

After enabling clean URLs, I'm seeing some problems with login. When I
login from the front page, everything works. However, when I try to
login from a page like /node/1 Drupal generates a bogus URL. Drupal
will load /user&destination=node%2F1 for which I get: "The requested
URL /user&destination=node/1 was not found on this server."

Adding ?q= at the front of the URL works (i.e. it works without clean
URLs), as does replacing %2F with a slash. This suggests that Drupal
doesn't want an encoded URL here, so maybe the last urlencode() call in
drupal_get_destination() should be removed or replaced with
drupal_urlencode().

This seems to be related to http://drupal.org/node/385918 but I'm not
entirely sure.