Handling Message-ID with templates better

Uses the header if it's defined in the template, unless :message_id is
explicitly passed
Merge pull request #4 from otherinbox/rm/default_to_template_message_id

Handling Message-ID with templates better