Synch to No Gnus 200510111141.

[elisp/gnus.git-] / lisp / mm-view.el

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index 8bf0c66..ed1ff3c 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -371,9 +371,9 @@
        (goto-char (point-max))))
     (save-restriction
       (narrow-to-region b (point))
-      (set-text-properties (point-min) (point-max) nil)
       (when (or (equal type "enriched")
                (equal type "richtext"))
+       (set-text-properties (point-min) (point-max) nil)
        (ignore-errors
          (enriched-decode (point-min) (point-max))))
       (mm-handle-set-undisplayer
@@ -597,9 +597,9 @@
        (cadar smime-keys)
      (smime-get-key-by-email
       (completing-read
-       (concat "Decipher using which key? "
-              (if smime-keys (concat "(default " (caar smime-keys) ") ")
-                ""))
+       (concat "Decipher using key"
+              (if smime-keys (concat "(default " (caar smime-keys) "): ")
+                ": "))
        smime-keys nil nil nil nil (car-safe (car-safe smime-keys))))))
   (goto-char (point-min))
   (while (search-forward "\r\n" nil t)