From 83c0fe79a26c6361872c57489fa135f9b9474965 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Thu, 2 Sep 2010 13:51:05 +0000
Subject: [PATCH] INT-1375 changed the default value for
 'should-mark-messages-as-read' to 'true'

---
 .../integration/mail/config/spring-integration-mail-2.0.xsd     | 2 +-
 .../mail/config/ImapIdleChannelAdapterParserTests.java          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 f1167a2cff..54277c890b 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
@@ -195,7 +195,7 @@
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="should-mark-messages-as-read" type="xsd:string" use="optional" default="false">
+		<xsd:attribute name="should-mark-messages-as-read" type="xsd:string" use="optional" default="true">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 	Specify whether mail messages should be marked as read aftre being retrieved (Not supported in POP3).
diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/ImapIdleChannelAdapterParserTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/ImapIdleChannelAdapterParserTests.java
index cfbbb11f8f..deefcb1c50 100644
--- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/ImapIdleChannelAdapterParserTests.java
+++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/ImapIdleChannelAdapterParserTests.java
@@ -64,7 +64,7 @@ public class ImapIdleChannelAdapterParserTests {
 		Properties properties = (Properties) receiverAccessor.getPropertyValue("javaMailProperties");
 		assertEquals(0, properties.size());
 		assertEquals(Boolean.TRUE, receiverAccessor.getPropertyValue("shouldDeleteMessages"));
-		assertEquals(Boolean.FALSE, receiverAccessor.getPropertyValue("shouldMarkMessagesAsRead"));
+		assertEquals(Boolean.TRUE, receiverAccessor.getPropertyValue("shouldMarkMessagesAsRead"));
 	}
 	@Test
 	public void simpleAdapterWithMarkeMessagesAsRead() {