--- a/lib/mime.tcl
+++ b/lib/mime.tcl
@@ -206,10 +206,6 @@ The following line makes exmh display th
 of the text/html part if both are present in a multipart/alternative:
 
 text/plain text/html"}
-{mime(saveDir) mimeSaveDir {~/attachments} {Save directory for attachments}
-"This defines the directory to use when saving attachments.  Attachments
-are saved by extracting them from the message and replacing the
-attachment with a message/external-body reference to the saved file."}
     }
     set i 0
     foreach char {A B C D E F G H I J K L M N O P Q R S T U V W X Y Z \
@@ -2925,41 +2921,27 @@ proc Mime_ShowXApp { tkw part } {
     $tkw insert insert \n
 }
 
-proc Mime_SaveAttachments {{dir {}}} {
-    global msg mime install argv0
+# az [2022-02-12 Sat 16:10] exmh-strip isn't installed by the debian package
+# (only shipped in docs/examples), and the idea of stripping off attachments
+# is not really reasonable anymore. i have therefore replaced the call
+# to exmh-strip with a simple call to mhstore (which does, hoever save
+# everything, not just attachments, and either in the profile's nmh-storage
+# or the current directory).
+proc Mime_SaveAttachments {} {
+    global msg exmh mime install argv0 mhProfile
 
-    if {$dir == ""} {
-      set dir $mime(saveDir)
+    if { [info exists mhProfile(nmh-storage) ]} {
+        set outdir $mhProfile(nmh-storage)
+    } else {
+        set outdir [pwd]
     }
-    file mkdir $dir
+
     if {[catch {
-      exec ${argv0}-strip $msg(path) $dir
+        exec mhstore -noverbose -auto -clobber auto +$exmh(folder) $msg(id)
     } err]} {
-        if {[regexp {(.*) exists} $err _ file]} {
-            if {[Mime_SaveAttachmentRetry $file]} {
-                file delete $file
-                exec ${argv0}-strip $msg(path) $dir
-            }
-        }
+        Exmh_Status $err
+    } else {
+        Exmh_Status "Saved in $outdir.";
     }
-    Msg_ShowCurrent
-}
-proc Mime_SaveAttachmentRetry {file} {
-    global exwin mime
-    set f [frame $exwin(mtext).save_err -bd 2 -relief ridge]
-
-    message $f.msg1 -text "File Exists\n$file\nDelete and retry?" -aspect 1000
-    pack $f.msg1 -side top -fill both
-
-    set b1 [frame $f.but -bd 10 -relief flat]
-    pack $b1 -side top
-
-    set mime(retry_save) 0
-    button $b1.cancel -text "Cancel" -command {destroy $exwin(mtext).save_err}
-    button $b1.ok -text "OK" -command {set mime(retry_save) 1; destroy $exwin(mtext).save_err}
-    pack $b1.cancel $b1.ok -side left -padx 3
-
-    Widget_PlaceDialog $exwin(mtext) $f
-    tkwait window $f
-    return $mime(retry_save)
 }
+
--- a/lib/app-defaults
+++ b/lib/app-defaults
@@ -450,7 +450,7 @@ exmh.iconic:		0
 *Mops.more.m.c_post: Post
 *Mops.more.m.l_grabaddr: Save From address
 *Mops.more.m.c_grabaddr: Address_Save
-*Mops.more.m.l_attach: Save/Extract Attachments
+*Mops.more.m.l_attach: Save Attachments
 *Mops.more.m.c_attach: Mime_SaveAttachments
 
 *Mops.more.m.pgp.entrylist: decrypt extract
