Overriding Subject header doesn't work

Hi,

I think I've found a bug, but please correct me if I'm misunderstanding the code.

I'm using the following function to set $headers['Subject']:

function phptemplate_webform_mail_headers_2($form_values, $node, $sid, $cid)

It gets called and returns as expected. It gets assigned to $headers[$cid] at line 1376. But at 1386 and 1397, $headers['Subject'] is checked directly, without $headers[$cid]['Subject']. So, it can't find the key, and uses the default value. Same thing with To, From, etc.

Finally, in a bunch of places there is $email_subject instead of $subjects[$cid]. I've attached a patch against -2.0 since that's what I'm using, but it looks like it will apply cleanly against -dev as well.

Thanks!
--Andrew