diff --git a/org.springframework.integration.mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-2.0.xsd b/org.springframework.integration.mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-2.0.xsd
index 5e66e35c0e..1f58663f97 100644
--- a/org.springframework.integration.mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-2.0.xsd
+++ b/org.springframework.integration.mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-2.0.xsd
@@ -103,9 +103,18 @@
 	Defines an IMAP IDLE channel adapter.
 				</xsd:documentation>
 			</xsd:annotation>
-			<xsd:attribute name="id" type="xsd:string"/>
+			<xsd:attribute name="id" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation>
+	A unique identifier for this adapter.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
 			<xsd:attribute name="channel" type="xsd:string" use="required">
 				<xsd:annotation>
+					<xsd:documentation>
+	Reference to a Message Channel to which Messages will be sent.
+					</xsd:documentation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
 							<tool:expected-type type="org.springframework.integration.core.MessageChannel"/>
@@ -113,9 +122,18 @@
 					</xsd:appinfo>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="store-uri" type="xsd:string" use="required"/>
+			<xsd:attribute name="store-uri" type="xsd:string" use="required">
+				<xsd:annotation>
+					<xsd:documentation>
+	URI for the Mail store from which to receive messages.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
 			<xsd:attribute name="java-mail-properties" type="xsd:string">
 				<xsd:annotation>
+					<xsd:documentation>
+	Reference to a 'java.util.Properties' instance with settings for the JavaMail Session.
+					</xsd:documentation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
 							<tool:expected-type type="java.util.Properties"/>
@@ -125,6 +143,9 @@
 			</xsd:attribute>
 			<xsd:attribute name="task-executor" type="xsd:string">
 				<xsd:annotation>
+					<xsd:documentation>
+	Reference to a TaskExecutor for sending Mail asynchronously.
+					</xsd:documentation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
 							<tool:expected-type type="org.springframework.core.task.TaskExecutor"/>
@@ -132,14 +153,20 @@
 					</xsd:appinfo>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="should-delete-messages" type="xsd:string">
+			<xsd:attribute name="should-delete-messages" type="xsd:string" use="required">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
-	Specify whether mail messages should be deleted after retrieval. The default is TRUE.
+	Specify whether mail messages should be deleted after retrieval.
 					]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="auto-startup" type="xsd:string" default="true"/>
+			<xsd:attribute name="auto-startup" type="xsd:string" default="true">
+				<xsd:annotation>
+					<xsd:documentation>
+	Specify whether this adapter should start automatically. Default is TRUE.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
 
diff --git a/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/ImapIdleChannelAdapterParserTests-context.xml b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/ImapIdleChannelAdapterParserTests-context.xml
index 662ff043a8..e94a116e79 100644
--- a/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/ImapIdleChannelAdapterParserTests-context.xml
+++ b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/ImapIdleChannelAdapterParserTests-context.xml
@@ -18,7 +18,8 @@
 	<mail:imap-idle-channel-adapter id="simpleAdapter"
 			store-uri="imap:foo"
 			channel="channel"
-			auto-startup="false"/>
+			auto-startup="false"
+			should-delete-messages="true"/>
 
 	<mail:imap-idle-channel-adapter id="customAdapter"
 			store-uri="imap:foo"