make sure to retain context when prepping msg