diff --git a/spring-integration-mail/src/main/java/org/springframework/integration/mail/config/MailHeaderEnricherParser.java b/spring-integration-mail/src/main/java/org/springframework/integration/mail/config/MailHeaderEnricherParser.java
index 82461390f1..0a09726349 100644
--- a/spring-integration-mail/src/main/java/org/springframework/integration/mail/config/MailHeaderEnricherParser.java
+++ b/spring-integration-mail/src/main/java/org/springframework/integration/mail/config/MailHeaderEnricherParser.java
@@ -34,6 +34,8 @@ public class MailHeaderEnricherParser extends HeaderEnricherParserSupport {
 		this.addElementToHeaderMapping("from", MailHeaders.FROM);
 		this.addElementToHeaderMapping("reply-to", MailHeaders.REPLY_TO);
 		this.addElementToHeaderMapping("content-type", MailHeaders.CONTENT_TYPE);
+		this.addElementToHeaderMapping("attachment-file-name", MailHeaders.ATTACHMENT_FILENAME);
+		this.addElementToHeaderMapping("multipart-mode", MailHeaders.MULTIPART_MODE);
 	}
 
 }
diff --git a/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-2.0.xsd b/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-2.0.xsd
index 3fa62518cd..0e8a31e49d 100644
--- a/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-2.0.xsd
+++ b/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-2.0.xsd
@@ -273,6 +273,8 @@
 						<xsd:element name="from" type="headerType"/>
 						<xsd:element name="reply-to" type="headerType"/>
 						<xsd:element name="content-type" type="headerType"/>
+						<xsd:element name="attachment-file-name" type="headerType"/>
+						<xsd:element name="multipart-mode" type="headerType"/>
 					</xsd:choice>
 					<xsd:attribute name="default-overwrite">
 						<xsd:annotation>
diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailHeaderEnricherTests-context.xml b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailHeaderEnricherTests-context.xml
index 7085c27f9b..bb113e3dfb 100644
--- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailHeaderEnricherTests-context.xml
+++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailHeaderEnricherTests-context.xml
@@ -14,6 +14,8 @@
 		<from value="test.from"/>
 		<reply-to value="test.reply-to"/>
 		<subject value="test.subject"/>
+		<attachment-file-name value="foo.txt"/>
+		<multipart-mode value="1"/>
 	</header-enricher>
 
 	<header-enricher input-channel="expressionsInput">
diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailHeaderEnricherTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailHeaderEnricherTests.java
index d7220002e2..8b0cb229eb 100644
--- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailHeaderEnricherTests.java
+++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailHeaderEnricherTests.java
@@ -57,6 +57,8 @@ public class MailHeaderEnricherTests {
 		assertEquals("test.from", headers.get(MailHeaders.FROM));
 		assertEquals("test.reply-to", headers.get(MailHeaders.REPLY_TO));
 		assertEquals("test.subject", headers.get(MailHeaders.SUBJECT));
+		assertEquals("foo.txt", headers.get(MailHeaders.ATTACHMENT_FILENAME));
+		assertEquals("1", headers.get(MailHeaders.MULTIPART_MODE));
 	}
 
 	@Test