diff --git a/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailSendingMessageHandler.java b/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailSendingMessageHandler.java
index 40d4726cd0..817e3c1653 100644
--- a/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailSendingMessageHandler.java
+++ b/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailSendingMessageHandler.java
@@ -17,7 +17,6 @@
 package org.springframework.integration.mail;
 
 import javax.mail.MessagingException;
-import javax.mail.internet.MimeBodyPart;
 import javax.mail.internet.MimeMessage;
 
 import org.springframework.core.io.ByteArrayResource;
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 8c348f88c7..82461390f1 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
@@ -21,6 +21,7 @@ import org.springframework.integration.mail.MailHeaders;
 
 /**
  * @author Mark Fisher
+ * @author Oleg Zhurakousky
  * @since 2.0
  */
 public class MailHeaderEnricherParser extends HeaderEnricherParserSupport {
@@ -32,6 +33,7 @@ public class MailHeaderEnricherParser extends HeaderEnricherParserSupport {
 		this.addElementToHeaderMapping("bcc", MailHeaders.BCC);
 		this.addElementToHeaderMapping("from", MailHeaders.FROM);
 		this.addElementToHeaderMapping("reply-to", MailHeaders.REPLY_TO);
+		this.addElementToHeaderMapping("content-type", MailHeaders.CONTENT_TYPE);
 	}
 
 }
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 f773ba8316..f09c26e612 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
@@ -257,6 +257,7 @@
 						<xsd:element name="bcc" type="headerType"/>
 						<xsd:element name="from" type="headerType"/>
 						<xsd:element name="reply-to" type="headerType"/>
+						<xsd:element name="content-type" 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/MessageWithContentTypeTests-context.xml b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MessageWithContentTypeTests-context.xml
index eafee38c7f..f8dd65229c 100644
--- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MessageWithContentTypeTests-context.xml
+++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MessageWithContentTypeTests-context.xml
@@ -13,14 +13,11 @@
 
 	<int:channel id="inputChannel"/>
 	
-	<int:header-enricher input-channel="inputChannel" output-channel="mailEnricherChannel">
-		<int:header name="mail_contentType" value="text/html"/>
-	</int:header-enricher>
-	
-	<int-mail:header-enricher input-channel="mailEnricherChannel" output-channel="mailChannel">
-		<int-mail:to value="emailaddress"/>
-		<int-mail:from value="emailaddress"/>
+	<int-mail:header-enricher input-channel="inputChannel" output-channel="mailChannel">
+		<int-mail:to value="mailto"/>
+		<int-mail:from value="mailfrom"/>
 		<int-mail:subject value="With Content Type"/>
+		<int-mail:content-type value="text/html"/>
 	</int-mail:header-enricher>
 	
 	<int:channel id="mailChannel"/>