X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmml.el;h=3199a0d26411b42e04e5cb096842904e88d6fca3;hb=71f930a11aca1a252cc29e71c0fb981e06b43328;hp=157ea0ee5d52b6e1651c03c40187c5ec45a6a10d;hpb=8c3fb9d3a66794194f7f6f0063d8198e38baf80a;p=elisp%2Fgnus.git-

diff --git a/lisp/mml.el b/lisp/mml.el
index 157ea0e..3199a0d 100644
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -442,6 +442,7 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
 		    ;; actually are hard newlines in the text.
 		    (let (use-hard-newlines)
 		      (when (and (string= type "text/plain")
+				 (not (string= (cdr (assq 'sign cont)) "pgp"))
 				 (or (null (assq 'format cont))
 				     (string= (cdr (assq 'format cont))
 					      "flowed"))
@@ -549,7 +550,8 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
 	    (message-options-set 'message-sender sender))
 	  (if (setq recipients (cdr (assq 'recipients cont)))
 	      (message-options-set 'message-recipients recipients))
-	  (let ((style (mml-signencrypt-style (first (or sign-item encrypt-item)))))
+	  (let ((style (mml-signencrypt-style
+			(first (or sign-item encrypt-item)))))
 	    ;; check if: we're both signing & encrypting, both methods
 	    ;; are the same (why would they be different?!), and that
 	    ;; the signencrypt style allows for combined operation.