extract Message for further cleanup; also improve perf for quote