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 0a09726349..1e5d78aa69 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,7 +34,7 @@ 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("attachment-filename", 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 0e8a31e49d..e1aa58f8fd 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,7 +273,7 @@
 						<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="attachment-filename" type="headerType"/>
 						<xsd:element name="multipart-mode" type="headerType"/>
 					</xsd:choice>
 					<xsd:attribute name="default-overwrite">
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 bb113e3dfb..878daec223 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,7 +14,7 @@
 		<from value="test.from"/>
 		<reply-to value="test.reply-to"/>
 		<subject value="test.subject"/>
-		<attachment-file-name value="foo.txt"/>
+		<attachment-filename value="foo.txt"/>
 		<multipart-mode value="1"/>
 	</header-enricher>