MDL-42207 standardise message text formatting