From 8764a050d5074a3ea91cf5d53fe14f5d900727ca Mon Sep 17 00:00:00 2001
From: Son NK <>
Date: Mon, 11 Jan 2021 15:25:54 +0100
Subject: [PATCH] fix orig email not correctly uploaded in
 handle_bounce_forward_phase()

---
 email_handler.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/email_handler.py b/email_handler.py
index 0d87aadf..13d9a563 100644
--- a/email_handler.py
+++ b/email_handler.py
@@ -1281,7 +1281,9 @@ def handle_bounce_forward_phase(msg: Message, email_log: EmailLog):
     random_name = str(uuid.uuid4())
 
     full_report_path = f"refused-emails/full-{random_name}.eml"
-    s3.upload_email_from_bytesio(full_report_path, BytesIO(to_bytes(msg)), random_name)
+    s3.upload_email_from_bytesio(
+        full_report_path, BytesIO(to_bytes(msg)), f"full-{random_name}"
+    )
 
     file_path = None
 
@@ -1298,7 +1300,9 @@ def handle_bounce_forward_phase(msg: Message, email_log: EmailLog):
         )
     else:
         file_path = f"refused-emails/{random_name}.eml"
-        s3.upload_email_from_bytesio(file_path, BytesIO(to_bytes(msg)), random_name)
+        s3.upload_email_from_bytesio(
+            file_path, BytesIO(to_bytes(orig_msg)), random_name
+        )
 
     refused_email = RefusedEmail.create(
         path=file_path, full_report_path=full_report_path, user_id=user.id