2001-11-16 Simon Josefsson <jas@extundo.com>

	* mail-source.el (mail-source-fetch-imap): Fix BODY.PEEK return
	value.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dc0131c..a5b926c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-16  Simon Josefsson  <jas@extundo.com>
+
+       * mail-source.el (mail-source-fetch-imap): Fix BODY.PEEK return
+       value.
+
 2001-11-16  Per Abrahamsen  <abraham@dina.kvl.dk>
 
        * message.el (message-strip-special-text-properties): New option.

diff --git a/lisp/mail-source.el b/lisp/mail-source.el
index 7058110..982db42 100644 (file)
--- a/lisp/mail-source.el
+++ b/lisp/mail-source.el
@@ -913,10 +913,11 @@ This only works when `display-time' is enabled."
                  (push (cons from imap-password) mail-source-password-cache)))
              ;; if predicate is nil, use all uids
              (dolist (uid (imap-search (or predicate "1:*") buf))
-               (when (setq str (if (imap-capability 'IMAP4rev1 buf)
-                                   (imap-fetch uid "BODY.PEEK[]" 'BODYDETAIL
-                                               nil buf)
-                           (imap-fetch uid "RFC822.PEEK" 'RFC822 nil buf)))
+               (when (setq str
+                           (if (imap-capability 'IMAP4rev1 buf)
+                               (caddar (imap-fetch uid "BODY.PEEK[]"
+                                                   'BODYDETAIL nil buf))
+                             (imap-fetch uid "RFC822.PEEK" 'RFC822 nil buf)))
                  (push uid remove)
                  (insert "From imap " (current-time-string) "\n")
                  (save-excursion