add context to messages