Merge branch '0.3.6-feature-sanitize-attachments-811'

1 files changed, 7 insertions, 0 deletions

diff --git a/alot/commands/thread.py b/alot/commands/thread.py
index 67888255..6349fe2b 100644
--- a/alot/commands/thread.py
+++ b/alot/commands/thread.py
@@ -926,6 +926,13 @@ class OpenAttachmentCommand(Command):
             if '%s' in handler_raw_commandstring:
                 nametemplate = entry.get('nametemplate', '%s')
                 prefix, suffix = parse_mailcap_nametemplate(nametemplate)
+
+                fn_hook = settings.get_hook('sanitize_attachment_filename')
+                if fn_hook:
+                    # get filename
+                    filename = self.attachment.get_filename()
+                    prefix, suffix = fn_hook(filename, prefix, suffix)
+
                 tmpfile = tempfile.NamedTemporaryFile(delete=False,
                                                       prefix=prefix,
                                                       suffix=suffix)