#107: Add container option to indicate the message container