diff --git a/reference/imap/functions/imap-mail-compose.xml b/reference/imap/functions/imap-mail-compose.xml
index 81c3a29480..376169b309 100644
--- a/reference/imap/functions/imap-mail-compose.xml
+++ b/reference/imap/functions/imap-mail-compose.xml
@@ -25,7 +25,10 @@
      <term><parameter>envelope</parameter></term>
      <listitem>
       <para>
-       An associative array of headers fields
+       An associative array of headers fields. Valid keys are: "remail",
+       "return_path", "date", "from", "reply_to", "in_reply_to", "subject",
+       "to", "cc", "bcc", "message_id" and "custom_headers" (which contains
+       associative array of other headers).
       </para>
      </listitem>
     </varlistentry>
@@ -36,8 +39,10 @@
        An indexed array of bodies
       </para>
       <para>
-       A body is an associative array which can consist of the following
-       keys: "type", "encoding", "subtype", "description" and "contents.data"
+       A body is an associative array which can consist of the following keys:
+       "type", "encoding", "charset", "type.parameters", "subtype", "id",
+       "description", "disposition.type", "disposition", "contents.data",
+       "lines", "bytes" and "md5".
       </para>
      </listitem>
     </varlistentry>