X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fmml2015.el;h=c52f888d24a4257781aaf2f4af0afe63ccfbc3f2;hb=682fae336c8b3b43b16e0730386fb84a2bcdb8b8;hp=ed385bc378cdd3635d5b3e39869e1f2ffaac036a;hpb=445691ffba462fccf75c1f992870a34d3a137c06;p=gnus

diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index ed385bc37..c52f888d2 100644
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -149,7 +149,8 @@ by you.")
 
 (defun mml2015-fix-micalg (alg)
   (and alg
-       (upcase (if (string-match "^pgp-" alg)
+       ;; Mutt/1.2.5i has seen sending micalg=php-sha1
+       (upcase (if (string-match "^p[gh]p-" alg)
 		   (substring alg (match-end 0))
 		 alg))))
 
@@ -361,7 +362,10 @@ by you.")
 	       (buffer-string)))
 	    (set-buffer cipher)
 	    (erase-buffer)
-	    (insert-buffer plain)))
+	    (insert-buffer plain)
+	    (goto-char (point-min))
+	    (while (search-forward "\r\n" nil t)
+	      (replace-match "\n" t t))))
 	'(t)
       ;; Some wrong with the return value, check plain text buffer.
       (if (> (point-max) (point-min))