Make sure we're done with the message before rebuilding.