Set a Message-Id in addition to the mail-id header

Relates to #13