#174 Message annotations (wip)