diff --git a/inbox/automatic-trust-transfer.xml b/inbox/automatic-trust-transfer.xml
index 1a0e9d6b..ab1dd760 100644
--- a/inbox/automatic-trust-transfer.xml
+++ b/inbox/automatic-trust-transfer.xml
@@ -124,48 +124,20 @@
 		<di>
 			<dt>Trust message</dt>
 			<dd>
-				OMEMO message which indicates that specific keys can be trusted or no longer trusted.
+				OMEMO message which indicates that specific keys can be trusted (authentication) or no longer trusted (revocation).
 				A trust message for a device's key sent to another device is a trust message that contains the key identifer of the given key for authentication or revocation.
 				If a trust message only contains key identifiers for authentication, it is called <cite>authentication message</cite>.
-				If it only contains keys identifiers for revocation, it is called <cite>revocation message</cite>.
-			</dd>
-		</di>
-		<di>
-			<dt>Authentication message</dt>
-			<dd>
-				An authentication message for a key is an OMEMO message which advises the receiving device to trust that key.
-			</dd>
-		</di>
-		<di>
-			<dt>Revocation message</dt>
-			<dd>
-				A revocation message for a key is an OMEMO message which advises the receiving device to not trust that key anymore.
+				If it only contains key identifiers for revocation, it is called <cite>revocation message</cite>.
 			</dd>
 		</di>
 	</dl>
 </section1>
-<section1 topic='Trust Message URI Types' anchor='trust-message'>
-	<section2 topic='Trust Message URI' anchor='trust-message'>
-		<p>
-			A trust message contains an XMPP URI (see &xep0147;) defined by the following scheme:
-		</p>
-		<example caption='Scheme of a Trust Message URI'><![CDATA[xmpp:<bare-jid>?omemo-trust;<auth|revoke>=<key-identifier-1>;<auth|revoke>=<key-identifier-2>;<...>;<auth|revoke>=<key-identifier-n>]]></example>
-		<example caption='Example of a Trust Message URI'><![CDATA[xmpp:user@example.org?omemo-trust;auth=623548d3835c6d33ef5cb680f7944ef381cf712bf23a0119dabe5c4f252cd02f;auth=d9f849b6b828309c5f2c8df4f38fd891887da5aaa24a22c50d52f69b4a80817e;revoke=b423f5088de9a924d51b31581723d850c7cc67d0a4fe6b267c3d301ff56d2413]]></example>
-	</section2>
-	<section2 topic='Authentication Message URI' anchor='authentication-message'>
-		<p>
-			An authentication message contains an XMPP URI defined by the following scheme:
-		</p>
-		<example caption='Scheme of an Authentication Message URI'><![CDATA[xmpp:<bare-jid>?omemo-trust;auth=<key-identifier-1>;auth=<key-identifier-2>;<...>;auth=<key-identifier-n>]]></example>
-		<example caption='Example of an Authentication Message URI'><![CDATA[xmpp:user@example.org?omemo-trust;auth=623548d3835c6d33ef5cb680f7944ef381cf712bf23a0119dabe5c4f252cd02f;auth=d9f849b6b828309c5f2c8df4f38fd891887da5aaa24a22c50d52f69b4a80817e]]></example>
-	</section2>
-	<section2 topic='Revocation Message URI' anchor='revocation-message'>
-		<p>
-			A revocation message contains an XMPP URI defined by the following scheme:
-		</p>
-		<example caption='Scheme of a Revocation Message URI'><![CDATA[xmpp:<bare-jid>?omemo-trust;revoke=<key-identifier>;revoke=<key-identifier-2>;<...>;revoke=<key-identifier-n>]]></example>
-		<example caption='Example of a Revocation Message URI'><![CDATA[xmpp:user@example.org?omemo-trust;revoke=623548d3835c6d33ef5cb680f7944ef381cf712bf23a0119dabe5c4f252cd02f;revoke=d9f849b6b828309c5f2c8df4f38fd891887da5aaa24a22c50d52f69b4a80817e]]></example>
-	</section2>
+<section1 topic='Trust Message URI' anchor='trust-message-uri'>
+	<p>
+		A trust message contains an <cite>XMPP URI</cite> (see &xep0147;) defined by the following scheme:
+	</p>
+	<example caption='Scheme of a Trust Message URI'><![CDATA[xmpp:<bare-jid>?omemo-trust;<auth|revoke>=<key-identifier-1>;<auth|revoke>=<key-identifier-2>;<...>;<auth|revoke>=<key-identifier-n>]]></example>
+	<example caption='Example of a Trust Message URI'><![CDATA[xmpp:user@example.org?omemo-trust;auth=623548d3835c6d33ef5cb680f7944ef381cf712bf23a0119dabe5c4f252cd02f;auth=d9f849b6b828309c5f2c8df4f38fd891887da5aaa24a22c50d52f69b4a80817e;revoke=b423f5088de9a924d51b31581723d850c7cc67d0a4fe6b267c3d301ff56d2413]]></example>
 </section1>
 <section1 topic='Use Cases' anchor='usecases'>
 	<p>