diff --git a/tests/features/smtp/send/embedded_message.feature b/tests/features/smtp/send/embedded_message.feature
new file mode 100644
index 00000000..0b1da8ee
--- /dev/null
+++ b/tests/features/smtp/send/embedded_message.feature
@@ -0,0 +1,49 @@
+Feature: SMTP sending embedded message
+  Background:
+    Given there exists an account with username "user@pm.me" and password "password"
+    And there exists an account with username "bridgetest@protonmail.com" and password "password"
+    And bridge starts
+    And the user logs in with username "user@pm.me" and password "password"
+    And the user logs in with username "bridgetest@protonmail.com" and password "password"
+    And user "user@pm.me" connects and authenticates SMTP client "1"
+
+  Scenario: Send it
+    When SMTP client "1" sends the following message from "user@pm.me" to "bridgetest@protonmail.com":
+      """
+      From: Bridge Test <user@pm.me>
+      To: Internal Bridge <bridgetest@protonmail.com>
+      Subject: Embedded message
+      Content-Type: multipart/mixed; boundary="boundary"
+
+      This is a multi-part message in MIME format.
+      --boundary
+      Content-Type: text/plain; charset=utf-8
+      Content-Transfer-Encoding: 7bit
+
+
+      --boundary
+      Content-Type: message/rfc822; name="embedded.eml"
+      Content-Transfer-Encoding: 7bit
+      Content-Disposition: attachment; filename="embedded.eml"
+
+      From: Bar <bar@example.com>
+      To: Bridge Test <bridgetest@pm.test>
+      Subject: (No Subject)
+      Content-Type: text/plain; charset=utf-8
+      Content-Transfer-Encoding: quoted-printable
+
+      hello
+
+      --boundary--
+
+
+      """
+    Then it succeeds
+    When user "user@pm.me" connects and authenticates IMAP client "1"
+    Then IMAP client "1" eventually sees the following messages in "Sent":
+      | from       | to                        | subject          |
+      | user@pm.me | bridgetest@protonmail.com | Embedded message |
+    When user "bridgetest@protonmail.com" connects and authenticates IMAP client "2"
+    Then IMAP client "2" eventually sees the following messages in "Inbox":
+      | from       | to                        | subject          | attachments  | unread |
+      | user@pm.me | bridgetest@protonmail.com | Embedded message | embedded.eml | true   |
\ No newline at end of file