message: skip <#secure

Signed-off-by: Julien Danjou <julien@danjou.info>

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bb395c8..9b3045f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -7,6 +7,8 @@
 
 2010-11-24  Julien Danjou  <julien@danjou.info>
 
+       * message.el (message-goto-body): Skip <#secure.
+
        * shr.el (shr-insert-color-overlay): Replace deprecated syntax.
        (shr-tag-body): Add background support.
        (shr-descend): Add background support.

diff --git a/lisp/message.el b/lisp/message.el
index bff11b2..1e9d47f 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -3098,8 +3098,11 @@ M-RET    `message-newline-and-reformat' (break the line and reformat)."
             (looking-at "[ \t]*\n"))
     (expand-abbrev))
   (goto-char (point-min))
-  (or (search-forward (concat "\n" mail-header-separator "\n") nil t)
-      (search-forward-regexp "[^:]+:\\([^\n]\\|\n[ \t]\\)+\n\n" nil t)))
+  (prog1
+      (or (search-forward (concat "\n" mail-header-separator "\n") nil t)
+          (search-forward-regexp "[^:]+:\\([^\n]\\|\n[ \t]\\)+\n\n" nil t))
+    (while (looking-at "^<#secure") (forward-line 1))))
+
 
 (defun message-in-body-p ()
   "Return t if point is in the message body."