From cdbd5319311c4cd1139e92ecf1bb1cf216a6e9d9 Mon Sep 17 00:00:00 2001
From: Christopher Broderick <chris@chris-mbp>
Date: Sat, 25 Mar 2023 13:06:03 +0000
Subject: [PATCH] Ensure multipart attachments are saved

---
 helpdesk/email.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/helpdesk/email.py b/helpdesk/email.py
index f27dc969..fdc5f8db 100644
--- a/helpdesk/email.py
+++ b/helpdesk/email.py
@@ -687,8 +687,8 @@ def extract_part_data(
             name = f"part-{counter}{ext}"
         else:
             name = f"part-{counter}_{name}"
-
-        files.append(SimpleUploadedFile(name, part.get_payload(decode=True), mimetypes.guess_type(name)[0]))
+        payload = decodeUnknown(part.get_charset(), part.as_bytes()) if part.is_multipart() else part.get_payload(decode=True)
+        files.append(SimpleUploadedFile(name, payload, mimetypes.guess_type(name)[0]))
         logger.debug("Found MIME attachment %s", name)
     return part_body, part_full_body