5747b02 Back to using moment for message headers