FAPI fix: missing form_state in contact module

When a user's personal contact form is requested, contact_user_page() no longer passes $recipient when it calls drupal_get_form('contact_mail_user', $recipient), resulting in a NULL recipient.

<?php
$output = drupal_get_form('contact_mail_user', $account);
...
function contact_mail_user($recipient) {
?>

The reason is that the $recipient array is now being passes as the second argument. This fixes it:

<?php
$output = drupal_get_form('contact_mail_user', $account);
...
function contact_mail_user($x, $recipient) {
?>

...but of course is by no means correct. My hunch is that this is a result of the FormAPI change and that $x should probably be $form_state. Please advise.