Message headers moved to propery
wip