# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bzr@mavit.org.uk-20110430152929-eaj2kamu07rgutgl
# target_branch: nosmart+bzr://bzr.savannah.gnu.org/emacs/trunk/
# testament_sha1: ef8db088392bf8fcaa680a1b3a15c8330d146423
# timestamp: 2011-04-30 16:30:01 +0100
# source_branch: bzr://bzr.savannah.gnu.org/emacs/trunk
# base_revision_id: viniciusjl@ig.com.br-20110430151507-\
#   wt20qtszxtt47p8y
# 
# Begin patch
=== modified file 'lisp/textmodes/flyspell.el'
--- lisp/textmodes/flyspell.el	2011-04-03 20:59:45 +0000
+++ lisp/textmodes/flyspell.el	2011-04-30 15:29:29 +0000
@@ -316,12 +316,15 @@
   "Function used for `flyspell-generic-check-word-predicate' in Mail mode."
   (let ((header-end (save-excursion
 		      (goto-char (point-min))
-		      (re-search-forward
-		       (concat "^"
-			       (regexp-quote mail-header-separator)
-			       "$")
-		       nil t)
-		      (point)))
+		      (if (not 
+			   (looking-at "^[A-Z]\\(?:\\(?:-[A-Z]\\)?[a-z]*\\)+:"))
+			  0
+			(re-search-forward
+			 (concat "^"
+				 (regexp-quote mail-header-separator)
+				 "$")
+			 nil t)
+			(point))))
 	(signature-begin
          (if (not (boundp 'message-signature-separator))
              (point-max)

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWefvRHYAAaXfgFAwVHv/9/IA
wB+////wUAPe9mAKiAANEIJPNTATRqeap6J6aR5IPU9CaG0gHMAmmATIYAAmCYAAAcwCaYBMhgAC
YJgAABFT/Umo09JpgTQ0GmIaZADTRoaZMCSQmTTRNMTRoBJ6mEyaJoMQZDRW8qYVSBkJ8YO9WL9N
nIs+vzIbtqael4EKO48HvkvQCaIBZIjIP2utpdVAQE8xKHQ+DPgmzXvpeZjBE9bp+RscRBHNl8Nq
L6W8kaWlc6JXGaERUWX+RNKCCGf3CdxlKDsiNuKxKTS6OaepRLGmd4qgWIjouBV5qoWKaLJL2vaV
LdWtUuVdyuSelvqpbGHXq4Xg3gvNhD6kGv5SIQZBUGLO3rgLJSUFMe6KlQiy6aREX3nj5UEaKKxK
o/Ijf52ZFv2ovpJNzpTarRGVN3J6oQYo5tbTy1VD0Jlm3JNmYUfJbnSVpS+YtYpl8QeFmi2kD7in
GbXWIIuLaPeMpOgWbjfpsjR8cPFzUytcDalVgPBa8ZlexbbDA58X3MC4LG7F77R5Go7PP7XyVkpD
r9OOajbbdgn7CyUVjbhCoY2V4TbOW2CuuUl8VatQt8y5Qk+vffZLqtjhSVVFgQFnjE4wJbMdQ15+
31ljqVLKnZz3VPaWTityaTQJhGtr3rH9DpPDpg5jL6dfmeu5dkpfcL7ADHyiBgtHE6cAFYcz/uom
Gh/SYHDFIgkk131KcAu9vv7jDz7/TAMDoH6vF65594o5Tl+HIjf1oq2S+EzKw8570iTepsalLwLY
z9LeNYNWVwENQiHcKb8eFCq5TLUYdkAg9Ddoh2WZnyUR9oSXHcJk8IQDbFgpaUsvCc5tvKRpED4r
R30+Nq9ofQ88BnA3AqLRiIHSrrfJkZ3TMbKHNUa8kDmE/OwZMsHZ38XstIVV8qufBf7RHGYQqN60
xmXnsTRPD3d/tPT0bm88uznPJrJLyFy2CwgJ3tXAHFlGpVqVRP6TLg8LPwubq/S7Q/1Tx0UiJ2DX
R3Zey3hnLaEpJH5d2i8YtrF5vUOomb1FsfoGEe8s69HjDnp7wgD3B8FXFR/GqIZattnALkb+q5JW
P36jbLpzlEYUSq9t7E2qqBzCrhfe6SriyGZMtUlaaunS1+aKwb3ZQMUe9K1TZ64mNMP+v8k/Ha5l
A5BKu3a2T5Wr4LbyuDe1PFORuSeD4K4ZHvpzxJJZCs7nrbufspGMWBw7MdgWpq8wbNXVnJuwTUJh
1apW3LR3KTy5LqpKUORgTdbGZ092ArYFJ3aikLQuCFTl9lFTjeuosuXclvpZlOxdReq23qGOCgGK
VMsta4LFSR3LCtdviuvEJ3ayy1LYv/F3JFOFCQ5+9Edg