4 files changed, 35 insertions, 11 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index dd93c7b22fe..0cea790792f 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,15 @@
+2013-01-11  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * gnus-art.el (gnus-mime-display-security): Use point-min-marker
+        and point-max-marker.
+        * gnus-async.el (gnus-async-article-callback): Use point-max-marker.
+
+2013-01-10  Uwe Brauer  <oub@mat.ucm.es>  (tiny change)
+
+        * mml-smime.el (mml-smime-encrypt-to-self): New user option analogous
+        to mml2015-encrypt-to-self.
+        (mml-smime-epg-encrypt): Respect mml-smime-encrypt-to-self.
+
 2013-01-09  Daiki Ueno  <ueno@gnu.org>
 
         * mml-smime.el (epg-sub-key-fingerprint): Autoload for
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 1b4cddc5009..25a555f3d8b 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -8688,9 +8688,7 @@ For example:
              gnus-mime-security-button-end-line-format))
         (gnus-insert-mime-security-button handle)))
     (mm-set-handle-multipart-parameter
-     handle 'gnus-region
-     (cons (set-marker (make-marker) (point-min))
-           (set-marker (make-marker) (point-max))))
+     handle 'gnus-region (cons (point-min-marker) (point-max-marker)))
     (goto-char (point-max))))
 
 (defun gnus-mime-security-run-function (function)
diff --git a/lisp/gnus/gnus-async.el b/lisp/gnus/gnus-async.el
index 41b0cc25006..c5d64332547 100644
--- a/lisp/gnus/gnus-async.el
+++ b/lisp/gnus/gnus-async.el
@@ -254,7 +254,7 @@ that was fetched."
          gnus-async-article-alist
          (cons (list (intern (format "%s-%d" group article)
                              gnus-async-hashtb)
-                     mark (set-marker (make-marker) (point-max))
+                     mark (point-max-marker)
                      group article)
                gnus-async-article-alist))))
     (if (not (gnus-buffer-live-p summary))
diff --git a/lisp/gnus/mml-smime.el b/lisp/gnus/mml-smime.el
index e5e99dedcbe..6ea55377e02 100644
--- a/lisp/gnus/mml-smime.el
+++ b/lisp/gnus/mml-smime.el
@@ -80,6 +80,12 @@ Whether the passphrase is cached at all is controlled by
   :version "24.4"
   :type 'boolean)
 
+(defcustom mml-smime-encrypt-to-self nil
+  "If t, add your own key ID to recipient list when encryption."
+  :group 'mime-security
+  :version "24.4"
+  :type 'boolean)
+
 (defun mml-smime-sign (cont)
   (let ((func (nth 1 (assq mml-smime-use mml-smime-function-alist))))
     (if func
@@ -475,13 +481,17 @@ Content-Disposition: attachment; filename=smime.p7s
     (goto-char (point-max))))
 
 (defun mml-smime-epg-encrypt (cont)
-  (let ((inhibit-redisplay t)
-        (context (epg-make-context 'CMS))
-        (config (epg-configuration))
-        (recipients (message-options-get 'mml-smime-epg-recipients))
-        cipher signers
-        (boundary (mml-compute-boundary cont))
-        recipient-key)
+  (let* ((inhibit-redisplay t)
+         (context (epg-make-context 'CMS))
+         (config (epg-configuration))
+         (recipients (message-options-get 'mml-smime-epg-recipients))
+         cipher signers
+         (sender (message-options-get 'message-sender))
+         (signer-names (or mml-smime-signers
+                           (if (and mml-smime-sign-with-sender sender)
+                               (list (concat "<" sender ">")))))
+         (boundary (mml-compute-boundary cont))
+         recipient-key)
     (unless recipients
       (setq recipients
             (apply #'nconc
@@ -494,6 +504,10 @@ Content-Disposition: attachment; filename=smime.p7s
                          (message-options-set 'message-recipients
                                               (read-string "Recipients: ")))
                      "[ \f\t\n\r\v,]+"))))
+      (when mml-smime-encrypt-to-self
+        (unless signer-names
+          (error "Neither message sender nor mml-smime-signers are set"))
+        (setq recipients (nconc recipients signer-names)))
       (if (eq mm-encrypt-option 'guided)
           (setq recipients
                 (epa-select-keys context "\