Add comment with context to sub-messages