Fixed message parameters being incorrectly replaced in the newly added
messages.