2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 6642a2082c7..0fa870e595f 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-25  Adam Sjøgren  <asjo@koldfront.dk>
+
+        * mml2015-el (mml2015-epg-key-image): Wrap epg-gpg-program in
+        shell-quote-argument.
+
 2013-02-22  David Engster  <deng@randomsample.de>
 
         * gnus-registry.el (gnus-registry-save): Provide class name when
diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el
index b20c02aa26f..39bce23e76c 100644
--- a/lisp/gnus/mml2015.el
+++ b/lisp/gnus/mml2015.el
@@ -865,7 +865,7 @@ If set, it overrides the setting of `mml2015-sign-with-sender'."
            (coding-system-for-read 'binary)
            (data (shell-command-to-string
                   (format "%s --list-options no-show-photos --attribute-fd 3 --list-keys %s 3>&1 >/dev/null 2>&1"
-                          epg-gpg-program key-id))))
+                          (shell-quote-argument epg-gpg-program) key-id))))
       (when (> (length data) 0)
         (insert (substring data 16))
         (create-image (buffer-string) nil t)))))