nnimap.el (nnimap-transform-headers): BODYSTRUCTURE for messages of type MESSAGE and subtype RFC822 is slightly different from those of type TEXT.

2 files changed, 11 insertions, 1 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index e13d2d594ca..7f4116d6636 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-11  Andrew Cohen  <cohen@andy.bu.edu>
+
+        * nnimap.el (nnimap-transform-headers): BODYSTRUCTURE for messages of
+        type MESSAGE and subtype RFC822 is slightly different from those of
+        type TEXT.
+
 2011-08-05  Andrew Cohen  <cohen@andy.bu.edu>
 
         * gnus-sum.el (gnus-summary-refer-article): Warp to article. This
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index f41f4af71b4..c940e06fbb6 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -218,7 +218,11 @@ textual parts.")
             (while (and (consp structure)
                         (not (stringp (car structure))))
               (setq structure (car structure)))
-            (setq lines (nth 7 structure))))
+            (setq lines (if (and
+                             (equal (upcase (nth 0 structure)) "MESSAGE")
+                             (equal (upcase (nth 1 structure)) "RFC822"))
+                            (nth 9 structure)
+                          (nth 7 structure)))))
         (delete-region (line-beginning-position) (line-end-position))
         (insert (format "211 %s Article retrieved." article))
         (forward-line 1)