Email Components show address for name, and name for address - Backwards!

Just like the subject line says. In a webform with an email component, under the options for From Name and From Email, the choices are the reverse of what they should be. I've attached a patch to fix this. The offending block is at line 588:

  if (is_array($node->webformcomponents) && !empty ($node->webformcomponents)) {
    foreach ($node->webformcomponents as $cid => $component) {
      $type = $component['type'];
/* This is wrong -- the first one should be email */
      if (in_array($type, array('textfield', 'hidden', 'select'))) {
        $possible_email_from_address[$component['name']] = $component['name'];
      }
/* This is wrong -- the first one should be textfield */
      if (in_array($type, array('email', 'hidden', 'select'))) {
        $possible_email_from_name[$component['name']] = $component['name'];
        $possible_email_subject[$component['name']] = $component['name'];
      }
    }
  }