Plumb the adding of message edit text back in

James Grahamrequested to merge
work/nvrwhere/restore_edit_text into master

This should also improve edits where there is code or quotes.

BUG: 516547

Merge request reports