Mail template for anonymous subscriptions

The mail sent for anonymous users contains "!mailto" and "!site" strings.

The problem comes from simplenews.module:

  ...
  $vars = $subscription->uid ? user_mail_tokens($subscription, $language) : array();
  ...

I would change it to:

  ...
  $vars = $subscription->uid ? user_mail_tokens($subscription, $language) : user_mail_tokens($context['account'], $language);
  ...