Improved message quoting