diff --git a/docs/asgi.rst b/docs/asgi.rst
index 18ebcfd..4aef65c 100644
--- a/docs/asgi.rst
+++ b/docs/asgi.rst
@@ -475,12 +475,13 @@ Keys:
 * ``scheme``: Unicode string URL scheme portion (likely ``http`` or ``https``).
   Optional (but must not be empty), default is ``"http"``.
 
-* ``path``: Byte string HTTP path from URL.
+* ``path``: Unicode string HTTP path from URL, with percent escapes decoded
+  and UTF8 byte sequences decoded into characters.
 
-* ``query_string``: Byte string URL portion after the ``?``. Optional, default
-  is ``""``.
+* ``query_string``: Unicode string URL portion after the ``?``, already
+  url-decoded, like ``path``. Optional, default is ``""``.
 
-* ``root_path``: Byte string that indicates the root path this application
+* ``root_path``: Unicode string that indicates the root path this application
   is mounted at; same as ``SCRIPT_NAME`` in WSGI. Optional, defaults
   to ``""``.
 
@@ -741,6 +742,80 @@ A maximum of one of ``bytes`` or ``text`` may be provided. If both are
 provided, the protocol server should ignore the message entirely.
 
 
+Email
+-----
+
+Represents emails sent or received, likely over the SMTP protocol though that
+is not directly specified here (a protocol server could in theory deliver
+or receive email over HTTP to some external service, for example). Generally
+adheres to RFC 5322 as much as possible.
+
+As emails have no concept of a session and there's no trustable socket or
+author model, the send and receive channels are both multi-listener, and
+there is no ``reply_channel`` on any message type. If you want to persist
+data across different email receive consumers, you should decide what part
+of the message to use for an identifier (from address? to address? subject?
+thread id?) and provide the persistence yourself.
+
+The protocol server should handle encoding of headers by itself, understanding
+RFC 1342 format headers and decoding them into unicode upon receive, and 
+encoding outgoing emails similarly (preferably using UTF-8).
+
+
+Receive
+'''''''
+
+Sent when an email is received.
+
+Channel: ``email.receive``
+
+Keys:
+
+* ``from``: Unicode string specifying the return-path of the email as specified
+  in the SMTP envelope. Will be ``None`` if no return path was provided.
+
+* ``to``: List of unicode strings specifying the recipients requested in the
+  SMTP envelope using ``RCPT TO`` commands. Will always contain at least one
+  value.
+
+* ``headers``: Dictionary of unicode string keys and unicode string values,
+  containing all headers, including ``subject``. Header names are all forced
+  to lower case. Header values are decoded from RFC 1342 if needed.
+
+* ``content``: Contains a content object (see section below) representing the
+  body of the message.
+
+Note that ``from`` and ``to`` are extracted from the SMTP envelope, and not
+from the headers inside the message; if you wish to get the header values,
+you should use ``headers['from']`` and ``headers['to']``; they may be different.
+
+
+Send
+''''
+
+Sends an email out via whatever transport 
+
+
+Content objects
+'''''''''''''''
+
+Used in both send and receive to represent the tree structure of a MIME
+multipart message tree.
+
+A content object is always a dict, containing at least the key:
+
+* ``content-type``: The unicode string of the content type for this section.
+
+Multipart content objects also have:
+
+* ``parts``: A list of content objects contained inside this multipart
+
+Any other type of object has:
+
+* ``body``: Byte string content of this part, decoded from any
+  ``Content-Transfer-Encoding`` if one was specified as a MIME header.
+
+
 UDP
 ---