Cloudmailin doesn't provide those two. It would be good to maybe see an example of what griddler expects the headers to look like on the way out?

I can start with a new hash. Stay tuned.