Merge "Fixes for messages quoting each other and punctuation"