[Bug 725498] Re: expose message-id to templates