diff --git a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/spring-integration-jms-1.0.xsd b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/spring-integration-jms-1.0.xsd
index 1514cad7e0..fecd990b0b 100644
--- a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/spring-integration-jms-1.0.xsd
+++ b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/spring-integration-jms-1.0.xsd
@@ -27,9 +27,9 @@
 		<xsd:complexType>
 			<xsd:complexContent>
 				<xsd:extension base="jmsInboundAdapterType">
-					<xsd:all>
+					<xsd:sequence>
 						<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1"/>
-					</xsd:all>
+					</xsd:sequence>
 					<xsd:attribute name="channel" type="xsd:string"/>
 					<xsd:attribute name="header-mapper" type="xsd:string"/>
 				</xsd:extension>
@@ -71,6 +71,9 @@
 		<xsd:complexType>
 			<xsd:complexContent>
 				<xsd:extension base="jmsAdapterType">
+					<xsd:sequence>
+						<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1"/>
+					</xsd:sequence>
 					<xsd:attribute name="channel" type="xsd:string"/>
 					<xsd:attribute name="header-mapper" type="xsd:string"/>
 				</xsd:extension>
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 1e6f2194a9..2b56dab680 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
@@ -36,10 +36,6 @@ import org.springframework.util.StringUtils;
  */
 public class MailOutboundChannelAdapterParser extends AbstractOutboundChannelAdapterParser {
 
-	protected Class<?> getBeanClass(Element element) {
-		return MailSendingMessageConsumer.class;
-	}
-
 	@Override
 	protected AbstractBeanDefinition parseConsumer(Element element, ParserContext parserContext) {
 		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(MailSendingMessageConsumer.class);
diff --git a/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/config/spring-integration-stream-1.0.xsd b/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/config/spring-integration-stream-1.0.xsd
index 3df04bf6ed..2c7710cd73 100644
--- a/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/config/spring-integration-stream-1.0.xsd
+++ b/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/config/spring-integration-stream-1.0.xsd
@@ -29,6 +29,7 @@
 				<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1"/>
 			</xsd:sequence>
 			<xsd:attribute name="id" type="xsd:string"/>
+			<xsd:attribute name="channel" type="xsd:string"/>
 			<xsd:attribute name="charset" type="xsd:string"/>
 		</xsd:complexType>
 	</xsd:element>