1 files changed, 8 insertions, 2 deletions

diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index 7a99a0dc46c..b0b4fd0a54d 100644
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -906,8 +906,14 @@ be \"related\" or \"alternate\"."
               (or disposition
                   (mml-content-disposition type (cdr (assq 'filename cont)))))
       (when parameters
-        (mml-insert-parameter-string
-         cont mml-content-disposition-parameters))
+        (let ((cont (copy-sequence cont)))
+          ;; Set the file name to what's specified by the user.
+          (when-let ((recipient-filename (cdr (assq 'recipient-filename cont))))
+            (setcdr cont
+                    (cons (cons 'filename recipient-filename)
+                          (cdr cont))))
+          (mml-insert-parameter-string
+           cont mml-content-disposition-parameters)))
       (insert "\n"))
     (unless (eq encoding '7bit)
       (insert (format "Content-Transfer-Encoding: %s\n" encoding)))