@@ -19,7 +19,7 @@

 ;; Commercial Software developed at private expense as specified in

 ;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable.

 ;;

-;; $Id: imap.cl,v 1.15 2000/06/08 14:31:11 jkf Exp $

+;; $Id: imap.cl,v 1.16 2000/06/08 14:41:00 jkf Exp $

 ;; Description:

 ;;

@@ -1358,7 +1358,8 @@

 		     (concatenate 'string (cdr (car headers))

 				  " " 

 				  value)))))))

-    headers))

+    (values headers

+	    (subseq text next end))))

 (defun make-envelope-from-text (text)

@@ -1018,11 +1018,13 @@ will contain the current count of messages in the mailbox.</p>

 <p><strong>text</strong> is a string that is the first part of a mail message, including

 at least all of the headers lines and the blank line following the headers.  This

-function parses the header lines and returns an assoc list where each item has the form <strong>

-(header . value)</strong>.&nbsp;&nbsp; Both the <strong>header</strong> and <strong>value</strong>

+function parses the header lines and returns an assoc list where each item has the form <strong>(header

+. value)</strong>.&nbsp;&nbsp; Both the <strong>header</strong> and <strong>value</strong>

 are strings.  Note that header names will most likely be mixed case (but this is not

 a requirment) so you'll want to use <strong>:test #'equalp</strong> when searching for a

-particular header with <strong>assoc</strong>. </p>

+particular header with <strong>assoc</strong>.&nbsp;&nbsp; <strong>parse-mail-header</strong>

+returns as a second value a string that is everything after the headers (which is often

+referred to as the body of the message).</p>

 <p>&nbsp;</p>