diff --git a/lambdas/email_attachment_saver/src/index.py b/lambdas/email_attachment_saver/src/index.py
index ed8b8f5..ac81093 100644
--- a/lambdas/email_attachment_saver/src/index.py
+++ b/lambdas/email_attachment_saver/src/index.py
@@ -1,6 +1,5 @@
 import boto3
 import email
-import base64
 from botocore.exceptions import NoCredentialsError
 from aws_lambda_powertools import Logger, Metrics
 
@@ -8,16 +7,28 @@
 metrics = Metrics()
 s3 = boto3.client('s3')
 
+
 def lambda_handler(event, context):
     """
-    This lambda saves email attachments to S3. 
+    This lambda downloads an email MIME file from S3, extracts its attachments, and saves them to another S3 folder.
     Returns: A dictionary containing the status code, a message, and the list of attachment ARNs
     """
     logger.info(event)
     bucket = event['bucket']
+    s3_email_key = event['s3_email_key']
     s3_folder = event['s3_folder_key']
-    raw_email_data = event['email_content']
-    msg = email.message_from_bytes(base64.b64decode(raw_email_data))
+
+    try:
+        response = s3.get_object(Bucket=bucket, Key=s3_email_key)
+    except NoCredentialsError:
+        logger.error('No AWS credentials found')
+        return {
+            'statusCode': 400,
+            'body': 'Error in the credentials'
+        }
+
+    raw_email_data = response['Body'].read()
+    msg = email.message_from_bytes(raw_email_data)
 
     attachment_arns = []
 
@@ -26,8 +37,10 @@ def lambda_handler(event, context):
             if part.get_content_maintype() != 'multipart' and part['Content-Disposition'] is not None:
                 try:
                     key = part.get_filename()
-                    s3.put_object(Bucket=bucket, Key=s3_folder+key, Body=part.get_payload(decode=True))
-                    attachment_arns.append('arn:aws:s3:::' + bucket + '/' + s3_folder + '/' + key)
+                    s3.put_object(Bucket=bucket, Key=s3_folder +
+                                  key, Body=part.get_payload(decode=True))
+                    attachment_arns.append(
+                        'arn:aws:s3:::' + bucket + '/' + s3_folder + '/' + key)
 
                 except NoCredentialsError:
                     logger.error('No AWS credentials found')
@@ -35,10 +48,10 @@ def lambda_handler(event, context):
                         'statusCode': 400,
                         'body': 'Error in the credentials'
                     }
-                
+
     logger.info(attachment_arns)
     return {
         'statusCode': 200,
         'body': 'Attachments saved to S3',
         'attachment_arns': attachment_arns
-    }
\ No newline at end of file
+    }