I left this alone for the rest of the document because it would just
enlarge the diff, but there's a lot more of this that could really use
some cleanup.
<p>Servers MUST NOT include the <stanza-id/> element in messages addressed to JIDs that do not have permissions to access the archive, such as a users’s outgoing messages to their contacts. However servers SHOULD include the element as a child of the forwarded message when using &xep0280;</p>
<examplecaption='Client receives a message that has been archived'><![CDATA[
<messageto='juliet@capulet.lit/balcony'
from='romeo@montague.lit/orchard'
from='romeo@montague.lit/orchard'
type='chat'>
<body>Call me but love, and I'll be new baptized; Henceforth I never will be Romeo.</body>