Merge ba16c23c52 into 4c2bb5aae1

reference 'Room event format' for Megolm-encrypted events
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
2026-08-04 15:07:47 +02:00 · 2026-07-21 08:06:40 +00:00 · 2026-07-21 10:06:37 +02:00
1 changed files with 3 additions and 1 deletions
--- a/content/client-server-api/modules/end_to_end_encryption.md
+++ b/content/client-server-api/modules/end_to_end_encryption.md
@ -1908,7 +1908,9 @@ The content of an [`m.room.encrypted`](#mroomencrypted) event using Megolm has t
 ```
 Note that when the event is received from the server, it will have additional
 properties alongside the `content` property, including a `type` (with a value
-of `m.room.encrypted`) and a `sender` property. In `content`, `ciphertext`
+of `m.room.encrypted`) and a `sender` property. (See [Room event format](#room-event-format).)
+
+Within `content`, `ciphertext`
 is a Base64-encoded [Megolm message](/olm-megolm/megolm/#message-format),
 whose plaintext body is of the form:
Author	SHA1	Message	Date
gewitternacht	8af492b135	Merge `ba16c23c52` into `4c2bb5aae1`	2026-07-21 08:06:40 +00:00
gewitternacht	ba16c23c52	reference 'Room event format' for Megolm-encrypted events Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>	2026-07-21 10:06:37 +02:00