Fixes for messages quoting each other and punctuation

Use {{int:}} to refer to the localised label.

Change-Id: Ifbc42e993a7c0d3922eedb8aad6401c1c17a4f24
Merge "Fixes for messages quoting each other and punctuation"