diff --git a/zerver/lib/email_mirror.py b/zerver/lib/email_mirror.py
index f89e0679ad..ab19d0becb 100644
--- a/zerver/lib/email_mirror.py
+++ b/zerver/lib/email_mirror.py
@@ -155,6 +155,8 @@ def create_missed_message_address(user_profile: UserProfile, message: Message) -
 def construct_zulip_body(
     message: EmailMessage,
     realm: Realm,
+    *,
+    sender: UserProfile,
     show_sender: bool = False,
     include_quotes: bool = False,
     include_footer: bool = False,
@@ -168,13 +170,13 @@ def construct_zulip_body(
 
     if not body.endswith("\n"):
         body += "\n"
-    body += extract_and_upload_attachments(message, realm)
+    body += extract_and_upload_attachments(message, realm, sender)
     if not body.rstrip():
         body = "(No email body)"
 
     if show_sender:
-        sender = str(message.get("From", ""))
-        body = f"From: {sender}\n{body}"
+        from_address = str(message.get("From", ""))
+        body = f"From: {from_address}\n{body}"
 
     return body
 
@@ -314,9 +316,7 @@ def filter_footer(text: str) -> str:
     return re.split(r"^\s*--\s*$", text, 1, flags=re.MULTILINE)[0].strip()
 
 
-def extract_and_upload_attachments(message: EmailMessage, realm: Realm) -> str:
-    user_profile = get_system_bot(settings.EMAIL_GATEWAY_BOT, realm.id)
-
+def extract_and_upload_attachments(message: EmailMessage, realm: Realm, sender: UserProfile) -> str:
     attachment_links = []
     for part in message.walk():
         content_type = part.get_content_type()
@@ -329,7 +329,7 @@ def extract_and_upload_attachments(message: EmailMessage, realm: Realm) -> str:
                     len(attachment),
                     content_type,
                     attachment,
-                    user_profile,
+                    sender,
                     target_realm=realm,
                 )
                 formatted_link = f"[{filename}]({s3_url})"
@@ -414,8 +414,9 @@ def process_stream_message(to: str, message: EmailMessage) -> None:
     if "include_quotes" not in options:
         options["include_quotes"] = is_forwarded(subject_header)
 
-    body = construct_zulip_body(message, stream.realm, **options)
-    send_zulip(get_system_bot(settings.EMAIL_GATEWAY_BOT, stream.realm_id), stream, subject, body)
+    user_profile = get_system_bot(settings.EMAIL_GATEWAY_BOT, stream.realm_id)
+    body = construct_zulip_body(message, stream.realm, sender=user_profile, **options)
+    send_zulip(user_profile, stream, subject, body)
     logger.info(
         "Successfully processed email to %s (%s)",
         stream.name,
@@ -440,7 +441,7 @@ def process_missed_message(to: str, message: EmailMessage) -> None:
         logger.warning("Sending user is not active. Ignoring this message notification email.")
         return
 
-    body = construct_zulip_body(message, user_profile.realm)
+    body = construct_zulip_body(message, user_profile.realm, sender=user_profile)
 
     assert recipient is not None
     if recipient.type == Recipient.STREAM:
diff --git a/zerver/tests/test_email_mirror.py b/zerver/tests/test_email_mirror.py
index 23a81bbd0e..1bcb6578df 100644
--- a/zerver/tests/test_email_mirror.py
+++ b/zerver/tests/test_email_mirror.py
@@ -834,6 +834,43 @@ class TestEmailMirrorMessagesWithAttachments(ZulipTestCase):
         # HTML body is empty, so the plaintext content should be picked, despite prefer-html option.
         self.assertEqual(message.content, "Test message")
 
+    def test_message_with_valid_attachment_missed_message(self) -> None:
+        user_profile = self.example_user("othello")
+        usermessage = most_recent_usermessage(user_profile)
+        mm_address = create_missed_message_address(user_profile, usermessage.message)
+
+        incoming_valid_message = EmailMessage()
+        incoming_valid_message.set_content("Test body")
+        with open(
+            os.path.join(settings.DEPLOY_ROOT, "static/images/default-avatar.png"), "rb"
+        ) as f:
+            image_bytes = f.read()
+
+        incoming_valid_message.add_attachment(
+            image_bytes,
+            maintype="image",
+            subtype="png",
+            filename="image.png",
+        )
+
+        incoming_valid_message["Subject"] = "TestStreamEmailMessages subject"
+        incoming_valid_message["From"] = self.example_email("othello")
+        incoming_valid_message["To"] = mm_address
+        incoming_valid_message["Reply-to"] = self.example_email("othello")
+
+        process_message(incoming_valid_message)
+
+        message = most_recent_message(user_profile)
+        self.assertEqual(message.sender, user_profile)
+        self.assertTrue(message.has_attachment)
+
+        attachment = Attachment.objects.last()
+        assert attachment is not None
+        self.assertEqual(attachment.realm, user_profile.realm)
+        self.assertEqual(attachment.owner, user_profile)
+        self.assertEqual(attachment.is_realm_public, True)
+        self.assertEqual(list(attachment.messages.values_list("id", flat=True)), [message.id])
+
 
 class TestStreamEmailMessagesEmptyBody(ZulipTestCase):
     def test_receive_stream_email_messages_empty_body(self) -> None: