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