The past/quoted reply should be a separate part too. The main part should only contain the new content. Potentially even the signature should be its own part.