diff --git a/docs/src/reference/docbook/event.xml b/docs/src/reference/docbook/event.xml
index 9f759ef787..29aa0217fc 100644
--- a/docs/src/reference/docbook/event.xml
+++ b/docs/src/reference/docbook/event.xml
@@ -26,11 +26,15 @@
     <para>
       For convenience namespace support is provided to configure an <classname>ApplicationEventListeningMessageProducer</classname>
       via the <emphasis>inbound-channel-adapter</emphasis> element.
-      <programlisting language="xml"><![CDATA[<int-event:inbound-channel-adapter channel="eventChannel" event-types="example.FooEvent, example.BarEvent"/>
+      <programlisting language="xml"><![CDATA[<int-event:inbound-channel-adapter channel="eventChannel" 
+                                   error-channel="eventErrorChannel"
+                                   event-types="example.FooEvent, example.BarEvent"/>
 
 <int:publish-subscribe-channel id="eventChannel"/>]]></programlisting>
 In the above example, all Application Context events that match one of the types specified by the 'event-types' (optional) attribute will be
-delivered as Spring Integration Messages to the Message Channel named 'eventChannel'.
+delivered as Spring Integration Messages to the Message Channel named 'eventChannel'. If a downstream component throws
+an exception, a MessagingException containing the failed message and exception will be sent to the channel named
+'eventErrorChannel'.  If no "error-channel" is specified, the exception will be propagated to the caller.
     </para>
   </section>
 
diff --git a/docs/src/reference/docbook/mail.xml b/docs/src/reference/docbook/mail.xml
index 7f501d369b..b4a5585574 100644
--- a/docs/src/reference/docbook/mail.xml
+++ b/docs/src/reference/docbook/mail.xml
@@ -156,6 +156,12 @@
                      reply-to="replyTo@example.org"
                      overwrite="false"/>]]></programlisting>
     </para>
+    <para>
+      Finally, the &lt;imap-idle-channel-adapter/&gt; also accepts the 'error-channel' attribute. 
+      If a synchronous downstream exception is thrown and an 'error-channel' is specified,
+      the MessagingException containing the failed message and exception, will be sent to this channel. 
+      Otherwise, any such exception will simply be logged as a warning by the channel adapter.
+    </para>
   </section>
 
 </chapter>
diff --git a/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-2.0.xsd b/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-2.0.xsd
index 078d5011cc..29748ed275 100644
--- a/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-2.0.xsd
+++ b/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-2.0.xsd
@@ -48,8 +48,8 @@
 					</xsd:appinfo>
 					<xsd:documentation>
 						If a (synchronous) downstream exception is thrown and an error-channel is specified,
-						the MessageHandlingException will be sent to this channel. Otherwise, any such exception
-						will be propagated to the calling thread.
+						the MessagingException will be sent to this channel. Otherwise, any such exception
+						will be propagated to the caller.
 					</xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
diff --git a/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-2.0.xsd b/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-2.0.xsd
index fa51d36b92..c6de636097 100644
--- a/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-2.0.xsd
+++ b/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-2.0.xsd
@@ -57,7 +57,7 @@ its configuration specifies the number of threads.
 							</xsd:appinfo>
 							<xsd:documentation>
 								If a (synchronous) downstream exception is thrown and an "error-channel" is specified,
-								the MessageHandlingException will be sent to this channel. Otherwise, any such exception
+								the MessagingException will be sent to this channel. Otherwise, any such exception
 								will simply be logged by the channel adapter.
 							</xsd:documentation>
 						</xsd:annotation>
@@ -133,7 +133,7 @@ adapter.
 					</xsd:appinfo>
 					<xsd:documentation>
 						If a (synchronous) downstream exception is thrown and an "error-channel" is specified,
-						the MessageHandlingException will be sent to this channel. Otherwise, any such exception
+						the MessagingException will be sent to this channel. Otherwise, any such exception
 						will simply be logged by the channel adapter.
 					</xsd:documentation>
 				</xsd:annotation>
@@ -214,7 +214,7 @@ A connection factory is needed by an inbound adapter. The connection factory mus
 					</xsd:appinfo>
 					<xsd:documentation>
 						If a (synchronous) downstream exception is thrown and an "error-channel" is specified,
-						the MessageHandlingException will be sent to this channel and the ultimate response
+						the MessagingException will be sent to this channel and the ultimate response
 						of the error flow will be returned as a response by the gateway. If no  
 						"error-channel" is specified, any such exception
 						will simply be logged by the gateway. In such a situation, no response is sent
diff --git a/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-2.0.xsd b/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-2.0.xsd
index 2c55e6687c..5c21dfeb1f 100644
--- a/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-2.0.xsd
+++ b/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-2.0.xsd
@@ -398,7 +398,7 @@
 							</xsd:appinfo>
 							<xsd:documentation>
 								If a (synchronous) downstream exception is thrown and an error-channel is specified,
-								the MessageHandlingException will be sent to this channel. Otherwise, any such exception
+								the MessagingException will be sent to this channel. Otherwise, any such exception
 								will be propagated to the listener container and any JMS transaction will be
 								rolled back. Any synchronous downstream exceptions in the error flow will
 								also cause any JMS transaction to be rolled back.
@@ -559,7 +559,7 @@
 							</xsd:appinfo>
 							<xsd:documentation>
 								If a (synchronous) downstream exception is thrown and an "error-channel" is specified,
-								the MessageHandlingException will be sent to this channel; any response from
+								the MessagingException will be sent to this channel; any response from
 								which will be returned as a reply by the gateway. If an "error-channel" is not 
 								supplied, any such exception
 								will be propagated to the listener container and any JMS transaction will be
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 6f7629ec20..f773ba8316 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
@@ -118,7 +118,7 @@
 							</xsd:appinfo>
 							<xsd:documentation>
 								If a (synchronous) downstream exception is thrown and an error-channel is specified,
-								the MessageHandlingException will be sent to this channel. Otherwise, any such exception
+								the MessagingException will be sent to this channel. Otherwise, any such exception
 								will simply be logged as a warning by the channel adapter.
 							</xsd:documentation>
 						</xsd:annotation>