diff --git a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.0.xsd b/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.0.xsd
index 87f42e81e6..5092eb2ae1 100644
--- a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.0.xsd
+++ b/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.0.xsd
@@ -1718,8 +1718,7 @@
 		<xsd:annotation>
 			<xsd:documentation>
 				Defines a Transformer that stores a Message and returns a new Message whose
-				payload is the id of
-				the stored Message.
+				payload is the id of the stored Message.
 			</xsd:documentation>
 		</xsd:annotation>
 	</xsd:element>
@@ -1728,10 +1727,8 @@
 		<xsd:annotation>
 			<xsd:documentation>
 				Defines a Transformer that accepts a Message whose payload is a UUID and
-				retrieves
-				the Message
-				associated with that id from a MessageStore if available
-				(else null).
+				retrieves the Message associated with that id from a MessageStore if
+				available (else null).
 			</xsd:documentation>
 		</xsd:annotation>
 	</xsd:element>
@@ -1740,10 +1737,11 @@
 		<xsd:sequence minOccurs="0" maxOccurs="1">
 			<xsd:element ref="poller" />
 		</xsd:sequence>
-		<xsd:attribute name="message-store" use="required">
+		<xsd:attribute name="message-store" default="messageStore">
 			<xsd:annotation>
 				<xsd:documentation>
 					Reference to the MessageStore to be used by this Claim Check transformer.
+					If not specified, the default reference will be to a bean named 'messageStore'.
 				</xsd:documentation>
 				<xsd:appinfo>
 					<tool:annotation kind="ref">