diff --git a/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/config/MailOutboundChannelAdapterParser.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/config/MailOutboundChannelAdapterParser.java
index 1d7c6eb99f..19c6443814 100644
--- a/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/config/MailOutboundChannelAdapterParser.java
+++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/config/MailOutboundChannelAdapterParser.java
@@ -45,7 +45,6 @@ public class MailOutboundChannelAdapterParser extends AbstractOutboundChannelAda
 		String host = element.getAttribute("host");
 		String username = element.getAttribute("username");
 		String password = element.getAttribute("password");
-		String headerGeneratorRef = element.getAttribute("header-generator");
 		if (StringUtils.hasText(mailSenderRef)) {
 			if (StringUtils.hasText(host) || StringUtils.hasText(username) || StringUtils.hasText(password)) {
 				throw new ConfigurationException("The 'host', 'username', and 'password' properties " +
@@ -67,9 +66,6 @@ public class MailOutboundChannelAdapterParser extends AbstractOutboundChannelAda
 		else {
 			throw new ConfigurationException("Either a 'mail-sender' reference or 'host' property is required.");
 		}
-		if (StringUtils.hasText(headerGeneratorRef)) {
-			builder.addPropertyReference("headerGenerator", headerGeneratorRef);
-		}
 		return builder.getBeanDefinition();
 	}