Wrong variable for message headers processing.

While sending a test message with htmlmail module I got:

Undefined variable: headers in HTMLMailSystem->mail() (linea 153 di [...]htmlmail.mail.inc)

I guess that line 153

$headers = $mime->txtHeaders($headers);

should probably be

$headers = $mime->txtHeaders($message['headers']);