Fix MailVolatileMessage code to deal with mail message headers