Merge "Tidy Message::parseAsBlock() by enabling tidy in MessageCache"