diff --git a/mu4e/mu4e-mime-parts.el b/mu4e/mu4e-mime-parts.el
index ba662a4d..7fd7d30d 100644
--- a/mu4e/mu4e-mime-parts.el
+++ b/mu4e/mu4e-mime-parts.el
@@ -101,8 +101,7 @@ There are some internal fields as well, e.g. ; subject to change:
                         (index (get-text-property (point) 'gnus-part)))
                (when (and part (numberp index) (not (member index indices)))
                  (let* ((disp (mm-handle-disposition part))
-                        (fname (cdr-safe
-                                (and disp (assoc 'filename (cdr disp)))))
+                        (fname (mm-handle-filename part))
                         (mime-type (mm-handle-media-type part))
                         (info
                          `(:part-index  ,index