mail is fixed in Drupal now.