Make rmail-mime toggle headers of non-mime messages.

* lisp/mail/rmailmm.el (rmail-mime): When rmail-enable-mime is non-nil,
if called on a non-mime message just toggle the headers.

Fixes: debbugs:8006

2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8902a714ab9..404324cb0e7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-24  Glenn Morris  <rgm@gnu.org>
+
+        * mail/rmailmm.el (rmail-mime): When rmail-enable-mime is non-nil,
+        if called on a non-mime message just toggle the headers.  (Bug#8006)
+
 2011-11-24  Juanma Barranquero  <lekktu@gmail.com>
 
         * allout.el (allout-setup, allout-auto-save-temporarily-disabled)
diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index e53e0c0744e..d01cfc7f2c8 100644
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -1269,7 +1269,8 @@ The arguments ARG and STATE have no effect in this case."
                              (or arg (goto-char (point-min)))
                              (point)) 'rmail-mime-entity)))
               (if (or (not arg) entity) (rmail-mime-toggle-raw state)))
-          (message "Not a MIME message")))
+          (message "Not a MIME message, just toggling headers")
+          (rmail-toggle-header)))
     (let* ((data (rmail-apply-in-message rmail-current-message 'buffer-string))
            (buf (get-buffer-create "*RMAIL*"))
            (rmail-mime-mbox-buffer rmail-view-buffer)