Backported r5820 and r5842

thomascube

2012-01-29 ee9ee7f66fae218afe24942166ba833eb490ada3

 plugins/additional_message_headers/additional_message_headers.php

@@ -19,7 +19,7 @@

    function init()
    {
        $this->add_hook('outgoing_message_headers', array($this, 'message_headers'));
        $this->add_hook('message_outgoing_headers', array($this, 'message_headers'));
    }

    function message_headers($args)