Fixes issue with html comments and message quoting