diff --git a/org.springframework.integration.adapter/src/main/resources/META-INF/spring-integration.parsers b/org.springframework.integration.adapter/src/main/resources/META-INF/spring-integration.parsers
deleted file mode 100644
index b8dc6a597a..0000000000
--- a/org.springframework.integration.adapter/src/main/resources/META-INF/spring-integration.parsers
+++ /dev/null
@@ -1,3 +0,0 @@
-mail-target=org.springframework.integration.adapter.mail.config.MailTargetParser
-polling-mail-source=org.springframework.integration.adapter.mail.config.PollingMailSourceParser
-imap-idle-mail-source=org.springframework.integration.adapter.mail.config.SubscribableImapIdleMailSourceParser
diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/config/pollingMailSourceParserTests.xml b/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/config/pollingMailSourceParserTests.xml
deleted file mode 100644
index 23fa41f489..0000000000
--- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/config/pollingMailSourceParserTests.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:si="http://www.springframework.org/schema/integration"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
-
-	<si:polling-mail-source id="pollingPop3" store-uri="pop3://mailtest:mailtest@ubuntuservervm/INBOX" />
-
-	
-</beans>
diff --git a/org.springframework.integration.mail/.classpath b/org.springframework.integration.mail/.classpath
index 468451f6c4..f07fa18112 100644
--- a/org.springframework.integration.mail/.classpath
+++ b/org.springframework.integration.mail/.classpath
@@ -17,5 +17,6 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock.classextension/2.3.0/com.springsource.org.easymock.classextension-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock.classextension/2.3.0/com.springsource.org.easymock.classextension-sources-2.3.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-2.1.3.jar" sourcepath="/IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-sources-2.1.3.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.integration.adapter"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.springframework.integration.mail/ivy.xml b/org.springframework.integration.mail/ivy.xml
index 64f1b1a614..50aec26d22 100644
--- a/org.springframework.integration.mail/ivy.xml
+++ b/org.springframework.integration.mail/ivy.xml
@@ -29,6 +29,7 @@
 		<dependency org="org.springframework" name="org.springframework.context.support" rev="2.5.5.A" conf="compile->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.test" rev="2.5.5.A" conf="test->runtime"/>
 		<dependency org="org.springframework.integration" name="org.springframework.integration" rev="latest.integration" conf="compile->compile"/>
+		<dependency org="org.springframework.integration" name="org.springframework.integration.adapter" rev="latest.integration" conf="compile->compile"/>
 	</dependencies>
 
 </ivy-module>
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/AbstractMailHeaderGenerator.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/AbstractMailHeaderGenerator.java
similarity index 98%
rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/AbstractMailHeaderGenerator.java
rename to org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/AbstractMailHeaderGenerator.java
index 8b859f7122..342a364ba3 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/AbstractMailHeaderGenerator.java
+++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/AbstractMailHeaderGenerator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.adapter.mail;
+package org.springframework.integration.mail;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/AbstractMailHeaderMapper.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/AbstractMailHeaderMapper.java
similarity index 97%
rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/AbstractMailHeaderMapper.java
rename to org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/AbstractMailHeaderMapper.java
index be3c68ffa3..ef51e3e414 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/AbstractMailHeaderMapper.java
+++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/AbstractMailHeaderMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2008 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.adapter.mail;
+package org.springframework.integration.mail;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -25,6 +25,7 @@ import javax.mail.internet.MimeMessage;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.integration.adapter.MessageHeaderMapper;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageHeaders;
@@ -32,9 +33,7 @@ import org.springframework.integration.message.MessagingException;
 import org.springframework.mail.javamail.MimeMailMessage;
 
 /**
- * 
  * @author Jonas Partner
- *
  */
 public abstract class AbstractMailHeaderMapper implements MessageHeaderMapper<MimeMessage> {
 
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/ByteArrayMailMessageMapper.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/ByteArrayMailMessageMapper.java
similarity index 97%
rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/ByteArrayMailMessageMapper.java
rename to org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/ByteArrayMailMessageMapper.java
index b7f1369a65..e7c5c8c195 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/ByteArrayMailMessageMapper.java
+++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/ByteArrayMailMessageMapper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.adapter.mail;
+package org.springframework.integration.mail;
 
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeMessage;
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/DefaultFolderConnection.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/DefaultFolderConnection.java
similarity index 91%
rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/DefaultFolderConnection.java
rename to org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/DefaultFolderConnection.java
index 4781c7801c..b220b6a7de 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/DefaultFolderConnection.java
+++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/DefaultFolderConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2008 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.adapter.mail;
+
+package org.springframework.integration.mail;
 
 import java.util.Properties;
 
@@ -26,21 +27,21 @@ import javax.mail.URLName;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.Lifecycle;
 import org.springframework.integration.ConfigurationException;
-import org.springframework.integration.adapter.mail.monitor.AsyncMonitoringStrategy;
-import org.springframework.integration.adapter.mail.monitor.MailTransportUtils;
-import org.springframework.integration.adapter.mail.monitor.MonitoringStrategy;
+import org.springframework.integration.mail.monitor.AsyncMonitoringStrategy;
+import org.springframework.integration.mail.monitor.MailTransportUtils;
+import org.springframework.integration.mail.monitor.MonitoringStrategy;
 import org.springframework.util.Assert;
 
 /**
- * A Connection to a mail folder capable of retrieving mail by utilising the
- * given instance of {@link MonitoringStrategy}
+ * A Connection to a mail folder capable of retrieving mail by utilizing the
+ * given instance of {@link MonitoringStrategy}.
  * 
  * @author Jonas Partner
- * 
  */
 public class DefaultFolderConnection implements Lifecycle, InitializingBean,
 		DisposableBean, FolderConnection {
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/DefaultMailHeaderGenerator.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/DefaultMailHeaderGenerator.java
similarity index 97%
rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/DefaultMailHeaderGenerator.java
rename to org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/DefaultMailHeaderGenerator.java
index 89f492d8b7..880d72c676 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/DefaultMailHeaderGenerator.java
+++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/DefaultMailHeaderGenerator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.adapter.mail;
+package org.springframework.integration.mail;
 
 import org.springframework.integration.message.Message;
 
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/DefaultMailMessageConverter.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/DefaultMailMessageConverter.java
similarity index 96%
rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/DefaultMailMessageConverter.java
rename to org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/DefaultMailMessageConverter.java
index 3480f99113..14075368b8 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/DefaultMailMessageConverter.java
+++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/DefaultMailMessageConverter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.adapter.mail;
+package org.springframework.integration.mail;
 
 import java.util.Map;
 
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/DefaultMailMessageHeaderMapper.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/DefaultMailMessageHeaderMapper.java
similarity index 93%
rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/DefaultMailMessageHeaderMapper.java
rename to org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/DefaultMailMessageHeaderMapper.java
index 2eb139b568..9ed2caf4a6 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/DefaultMailMessageHeaderMapper.java
+++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/DefaultMailMessageHeaderMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2008 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.adapter.mail;
+package org.springframework.integration.mail;
 
 import org.springframework.integration.message.MessageHeaders;
 
 /**
  * @author Jonas Partner
- * 
  */
 public class DefaultMailMessageHeaderMapper extends AbstractMailHeaderMapper {
 
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/FolderConnection.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/FolderConnection.java
similarity index 94%
rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/FolderConnection.java
rename to org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/FolderConnection.java
index c07d48f78d..7eadb37698 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/FolderConnection.java
+++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/FolderConnection.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.adapter.mail;
+package org.springframework.integration.mail;
 
 import javax.mail.Folder;
 import javax.mail.Message;
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/MailHeaderGenerator.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/MailHeaderGenerator.java
similarity index 96%
rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/MailHeaderGenerator.java
rename to org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/MailHeaderGenerator.java
index 87db6e1f76..e3a584a15d 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/MailHeaderGenerator.java
+++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/MailHeaderGenerator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.adapter.mail;
+package org.springframework.integration.mail;
 
 import org.springframework.integration.message.Message;
 import org.springframework.mail.MailMessage;
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/MailHeaders.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/MailHeaders.java
similarity index 95%
rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/MailHeaders.java
rename to org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/MailHeaders.java
index 9a5c22bc4d..cc17ca6e9f 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/MailHeaders.java
+++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/MailHeaders.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.adapter.mail;
+package org.springframework.integration.mail;
 
 /**
  * Pre-defined names and prefixes to be used for setting and/or retrieving Mail attributes
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/MailMessageConverter.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/MailMessageConverter.java
similarity index 94%
rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/MailMessageConverter.java
rename to org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/MailMessageConverter.java
index 090f760a7a..c9d7f3f019 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/MailMessageConverter.java
+++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/MailMessageConverter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.adapter.mail;
+package org.springframework.integration.mail;
 
 import javax.mail.internet.MimeMessage;
 
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/MailTarget.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/MailTarget.java
similarity index 98%
rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/MailTarget.java
rename to org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/MailTarget.java
index 1b58db3d53..0ab21d11f6 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/MailTarget.java
+++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/MailTarget.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.adapter.mail;
+package org.springframework.integration.mail;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.integration.message.Message;
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/PollingMailSource.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/PollingMailSource.java
similarity index 90%
rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/PollingMailSource.java
rename to org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/PollingMailSource.java
index 12b0c8c47f..6551fda986 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/PollingMailSource.java
+++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/PollingMailSource.java
@@ -14,15 +14,16 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.adapter.mail;
+package org.springframework.integration.mail;
 
 import javax.mail.internet.MimeMessage;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.integration.adapter.mail.monitor.DefaultLocalMailMessageStore;
-import org.springframework.integration.adapter.mail.monitor.LocalMailMessageStore;
-import org.springframework.integration.adapter.mail.monitor.MonitoringStrategy;
+
+import org.springframework.integration.mail.monitor.DefaultLocalMailMessageStore;
+import org.springframework.integration.mail.monitor.LocalMailMessageStore;
+import org.springframework.integration.mail.monitor.MonitoringStrategy;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageSource;
 import org.springframework.integration.message.PollableSource;
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/StaticMailHeaderGenerator.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/StaticMailHeaderGenerator.java
similarity index 97%
rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/StaticMailHeaderGenerator.java
rename to org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/StaticMailHeaderGenerator.java
index 66de5c2d2f..3902dde8bf 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/StaticMailHeaderGenerator.java
+++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/StaticMailHeaderGenerator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.adapter.mail;
+package org.springframework.integration.mail;
 
 import org.springframework.integration.message.Message;
 
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/SubscribableMailSource.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/SubscribableMailSource.java
similarity index 96%
rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/SubscribableMailSource.java
rename to org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/SubscribableMailSource.java
index 3ab6b68982..72536cfbab 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/SubscribableMailSource.java
+++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/SubscribableMailSource.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.adapter.mail;
+package org.springframework.integration.mail;
 
 import javax.mail.Message;
 import javax.mail.internet.MimeMessage;
@@ -25,8 +25,8 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.context.Lifecycle;
 import org.springframework.core.task.TaskExecutor;
-import org.springframework.integration.adapter.mail.monitor.AsyncMonitoringStrategy;
 import org.springframework.integration.channel.MessageChannel;
+import org.springframework.integration.mail.monitor.AsyncMonitoringStrategy;
 import org.springframework.integration.message.MessageSource;
 import org.springframework.integration.message.MessageTarget;
 import org.springframework.util.Assert;
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/TextMailMessageMapper.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/TextMailMessageMapper.java
similarity index 96%
rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/TextMailMessageMapper.java
rename to org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/TextMailMessageMapper.java
index 08a0a60f27..7a156d112a 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/TextMailMessageMapper.java
+++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/TextMailMessageMapper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.adapter.mail;
+package org.springframework.integration.mail;
 
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageMapper;
diff --git a/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/config/MailNamespaceHandler.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/config/MailNamespaceHandler.java
new file mode 100644
index 0000000000..a28c57d3e0
--- /dev/null
+++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/config/MailNamespaceHandler.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2002-2008 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.integration.mail.config;
+
+import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
+
+/**
+ * Namespace handler for the 'mail' namespace.
+ * 
+ * @author Mark Fisher
+ */
+public class MailNamespaceHandler extends NamespaceHandlerSupport {
+
+	public void init() {
+		this.registerBeanDefinitionParser("mail-target", new MailTargetParser());
+		this.registerBeanDefinitionParser("polling-mail-source", new PollingMailSourceParser());
+		this.registerBeanDefinitionParser("imap-idle-mail-source", new SubscribableImapIdleMailSourceParser());
+	}
+
+}
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/config/MailTargetParser.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/config/MailTargetParser.java
similarity index 95%
rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/config/MailTargetParser.java
rename to org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/config/MailTargetParser.java
index 13e93fe4ba..a87050ccd9 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/config/MailTargetParser.java
+++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/config/MailTargetParser.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.adapter.mail.config;
+package org.springframework.integration.mail.config;
 
 import org.w3c.dom.Element;
 
@@ -22,7 +22,7 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.ConfigurationException;
-import org.springframework.integration.adapter.mail.MailTarget;
+import org.springframework.integration.mail.MailTarget;
 import org.springframework.mail.javamail.JavaMailSenderImpl;
 import org.springframework.util.StringUtils;
 
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/config/PollingMailSourceParser.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/config/PollingMailSourceParser.java
similarity index 84%
rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/config/PollingMailSourceParser.java
rename to org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/config/PollingMailSourceParser.java
index 2cbcf34acb..209ea087a9 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/config/PollingMailSourceParser.java
+++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/config/PollingMailSourceParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2008 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,24 +13,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.adapter.mail.config;
+
+package org.springframework.integration.mail.config;
+
+import org.w3c.dom.Element;
 
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.ConfigurationException;
-import org.springframework.integration.adapter.mail.DefaultFolderConnection;
-import org.springframework.integration.adapter.mail.PollingMailSource;
-import org.springframework.integration.adapter.mail.monitor.MonitoringStrategy;
-import org.springframework.integration.adapter.mail.monitor.PollingMonitoringStrategy;
-import org.springframework.integration.adapter.mail.monitor.Pop3PollingMonitoringStrategy;
+import org.springframework.integration.mail.DefaultFolderConnection;
+import org.springframework.integration.mail.PollingMailSource;
+import org.springframework.integration.mail.monitor.MonitoringStrategy;
+import org.springframework.integration.mail.monitor.PollingMonitoringStrategy;
+import org.springframework.integration.mail.monitor.Pop3PollingMonitoringStrategy;
 import org.springframework.util.StringUtils;
-import org.w3c.dom.Element;
 
 /**
- * 
  * @author Jonas Partner
- * 
  */
 public class PollingMailSourceParser extends AbstractSingleBeanDefinitionParser {
 
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/config/SubscribableImapIdleMailSourceParser.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/config/SubscribableImapIdleMailSourceParser.java
similarity index 88%
rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/config/SubscribableImapIdleMailSourceParser.java
rename to org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/config/SubscribableImapIdleMailSourceParser.java
index f5f88c286f..d9537693e4 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/config/SubscribableImapIdleMailSourceParser.java
+++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/config/SubscribableImapIdleMailSourceParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2008 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,22 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.adapter.mail.config;
+
+package org.springframework.integration.mail.config;
+
+import org.w3c.dom.Element;
 
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.ConfigurationException;
-import org.springframework.integration.adapter.mail.DefaultFolderConnection;
-import org.springframework.integration.adapter.mail.SubscribableMailSource;
-import org.springframework.integration.adapter.mail.monitor.ImapIdleMonitoringStrategy;
+import org.springframework.integration.mail.DefaultFolderConnection;
+import org.springframework.integration.mail.SubscribableMailSource;
+import org.springframework.integration.mail.monitor.ImapIdleMonitoringStrategy;
 import org.springframework.util.StringUtils;
-import org.w3c.dom.Element;
 
 /**
- * 
  * @author Jonas Partner
- *
  */
 public class SubscribableImapIdleMailSourceParser extends
 		AbstractSingleBeanDefinitionParser {
diff --git a/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/config/spring-integration-mail-1.0.xsd b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/config/spring-integration-mail-1.0.xsd
new file mode 100644
index 0000000000..82aeb80768
--- /dev/null
+++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/config/spring-integration-mail-1.0.xsd
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns="http://www.springframework.org/schema/integration/mail"
+		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+		xmlns:beans="http://www.springframework.org/schema/beans"
+		xmlns:tool="http://www.springframework.org/schema/tool"
+		targetNamespace="http://www.springframework.org/schema/integration/mail"
+		elementFormDefault="qualified"
+		attributeFormDefault="unqualified">
+
+	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
+	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
+
+	<xsd:annotation>
+		<xsd:documentation><![CDATA[
+	Defines the configuration elements for Spring Integration's Mail Channel Adapters.
+		]]></xsd:documentation>
+	</xsd:annotation>
+
+	<xsd:element name="mail-target">
+		<xsd:complexType>
+			<xsd:annotation>
+				<xsd:documentation>
+	Defines a mail-sending target.
+				</xsd:documentation>
+			</xsd:annotation>
+			<xsd:attribute name="id" type="xsd:string"/>
+			<xsd:attribute name="mail-sender" type="xsd:string"/>
+			<xsd:attribute name="header-generator" type="xsd:string"/>
+			<xsd:attribute name="host" type="xsd:string"/>
+			<xsd:attribute name="username" type="xsd:string"/>
+			<xsd:attribute name="password" type="xsd:string"/>
+		</xsd:complexType>
+	</xsd:element>
+	
+	<xsd:element name="polling-mail-source">
+		<xsd:complexType>
+			<xsd:annotation>
+				<xsd:documentation>
+	Defines a polling mail source.
+				</xsd:documentation>
+			</xsd:annotation>
+			<xsd:attribute name="id" type="xsd:string" use="required"/>
+			<xsd:attribute name="store-uri" type="xsd:string" use="required"/>
+			<xsd:attribute name="mail-convertor" type="xsd:string" use="optional"/>
+		</xsd:complexType>
+	</xsd:element>
+	
+	<xsd:element name="imap-idle-mail-source">
+		<xsd:complexType>
+			<xsd:annotation>
+				<xsd:documentation>
+	Defines a polling mail source.
+				</xsd:documentation>
+			</xsd:annotation>
+			<xsd:attribute name="id" type="xsd:string" use="required"/>
+			<xsd:attribute name="store-uri" type="xsd:string" use="required"/>
+			<xsd:attribute name="task-executor" type="xsd:string" use="required"/>
+			<xsd:attribute name="mail-convertor" type="xsd:string" use="optional"/>
+		</xsd:complexType>
+	</xsd:element>
+
+</xsd:schema>
\ No newline at end of file
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/monitor/AbstractMonitoringStrategy.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/monitor/AbstractMonitoringStrategy.java
similarity index 99%
rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/monitor/AbstractMonitoringStrategy.java
rename to org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/monitor/AbstractMonitoringStrategy.java
index 60574c5970..2db320a44b 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/monitor/AbstractMonitoringStrategy.java
+++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/monitor/AbstractMonitoringStrategy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.adapter.mail.monitor;
+package org.springframework.integration.mail.monitor;
 
 import javax.mail.FetchProfile;
 import javax.mail.Flags;
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/monitor/AsyncMonitoringStrategy.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/monitor/AsyncMonitoringStrategy.java
similarity index 93%
rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/monitor/AsyncMonitoringStrategy.java
rename to org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/monitor/AsyncMonitoringStrategy.java
index 208351c70d..25efbd4c28 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/monitor/AsyncMonitoringStrategy.java
+++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/monitor/AsyncMonitoringStrategy.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.adapter.mail.monitor;
+package org.springframework.integration.mail.monitor;
 
 import javax.mail.Folder;
 import javax.mail.MessagingException;
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/monitor/DefaultLocalMailMessageStore.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/monitor/DefaultLocalMailMessageStore.java
similarity index 95%
rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/monitor/DefaultLocalMailMessageStore.java
rename to org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/monitor/DefaultLocalMailMessageStore.java
index 16ddf00047..f5f260c45c 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/monitor/DefaultLocalMailMessageStore.java
+++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/monitor/DefaultLocalMailMessageStore.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.adapter.mail.monitor;
+package org.springframework.integration.mail.monitor;
 
 import java.util.concurrent.ConcurrentLinkedQueue;
 
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/monitor/ImapIdleMonitoringStrategy.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/monitor/ImapIdleMonitoringStrategy.java
similarity index 97%
rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/monitor/ImapIdleMonitoringStrategy.java
rename to org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/monitor/ImapIdleMonitoringStrategy.java
index 502ff9d875..e75cf15074 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/monitor/ImapIdleMonitoringStrategy.java
+++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/monitor/ImapIdleMonitoringStrategy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.adapter.mail.monitor;
+package org.springframework.integration.mail.monitor;
 
 import javax.mail.Folder;
 import javax.mail.Message;
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/monitor/LocalMailMessageStore.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/monitor/LocalMailMessageStore.java
similarity index 93%
rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/monitor/LocalMailMessageStore.java
rename to org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/monitor/LocalMailMessageStore.java
index 17fde67797..c43663ee5b 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/monitor/LocalMailMessageStore.java
+++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/monitor/LocalMailMessageStore.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.adapter.mail.monitor;
+package org.springframework.integration.mail.monitor;
 
 import javax.mail.Message;
 
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/monitor/MailTransportConstants.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/monitor/MailTransportConstants.java
similarity index 93%
rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/monitor/MailTransportConstants.java
rename to org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/monitor/MailTransportConstants.java
index dcd7239940..d3b05d40e3 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/monitor/MailTransportConstants.java
+++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/monitor/MailTransportConstants.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.adapter.mail.monitor;
+package org.springframework.integration.mail.monitor;
 
 
 /**
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/monitor/MailTransportUtils.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/monitor/MailTransportUtils.java
similarity index 99%
rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/monitor/MailTransportUtils.java
rename to org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/monitor/MailTransportUtils.java
index 0a1020561f..fff6241bd1 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/monitor/MailTransportUtils.java
+++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/monitor/MailTransportUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.adapter.mail.monitor;
+package org.springframework.integration.mail.monitor;
 
 import java.net.URI;
 import java.net.URISyntaxException;
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/monitor/MonitoringStrategy.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/monitor/MonitoringStrategy.java
similarity index 96%
rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/monitor/MonitoringStrategy.java
rename to org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/monitor/MonitoringStrategy.java
index 08feda4b03..f75e42c1a1 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/monitor/MonitoringStrategy.java
+++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/monitor/MonitoringStrategy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.adapter.mail.monitor;
+package org.springframework.integration.mail.monitor;
 
 import javax.mail.Folder;
 import javax.mail.Message;
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/monitor/PollingMonitoringStrategy.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/monitor/PollingMonitoringStrategy.java
similarity index 94%
rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/monitor/PollingMonitoringStrategy.java
rename to org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/monitor/PollingMonitoringStrategy.java
index 05a7336cc1..1add4f4f60 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/monitor/PollingMonitoringStrategy.java
+++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/monitor/PollingMonitoringStrategy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.adapter.mail.monitor;
+package org.springframework.integration.mail.monitor;
 
 
 /**
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/monitor/Pop3PollingMonitoringStrategy.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/monitor/Pop3PollingMonitoringStrategy.java
similarity index 97%
rename from org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/monitor/Pop3PollingMonitoringStrategy.java
rename to org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/monitor/Pop3PollingMonitoringStrategy.java
index 3527b5283b..a38f297605 100644
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/mail/monitor/Pop3PollingMonitoringStrategy.java
+++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/monitor/Pop3PollingMonitoringStrategy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.adapter.mail.monitor;
+package org.springframework.integration.mail.monitor;
 
 import javax.mail.Folder;
 import javax.mail.Message;
diff --git a/org.springframework.integration.mail/src/main/resources/META-INF/spring.handlers b/org.springframework.integration.mail/src/main/resources/META-INF/spring.handlers
new file mode 100644
index 0000000000..6eb252f4c3
--- /dev/null
+++ b/org.springframework.integration.mail/src/main/resources/META-INF/spring.handlers
@@ -0,0 +1 @@
+http\://www.springframework.org/schema/integration/mail=org.springframework.integration.mail.config.MailNamespaceHandler
\ No newline at end of file
diff --git a/org.springframework.integration.mail/src/main/resources/META-INF/spring.schemas b/org.springframework.integration.mail/src/main/resources/META-INF/spring.schemas
new file mode 100644
index 0000000000..f9df2033b5
--- /dev/null
+++ b/org.springframework.integration.mail/src/main/resources/META-INF/spring.schemas
@@ -0,0 +1 @@
+http\://www.springframework.org/schema/integration/mail/spring-integration-mail-1.0.xsd=org/springframework/integration/mail/config/spring-integration-mail-1.0.xsd
\ No newline at end of file
diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/DefaultMailMessageHeaderMapperTests.java b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/DefaultMailMessageHeaderMapperTests.java
similarity index 97%
rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/DefaultMailMessageHeaderMapperTests.java
rename to org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/DefaultMailMessageHeaderMapperTests.java
index d5403409ac..8c718cf307 100644
--- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/DefaultMailMessageHeaderMapperTests.java
+++ b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/DefaultMailMessageHeaderMapperTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.adapter.mail;
+package org.springframework.integration.mail;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -32,6 +32,8 @@ import javax.mail.internet.MimeMessage;
 import org.easymock.classextension.EasyMock;
 import org.junit.Test;
 
+import org.springframework.integration.mail.DefaultMailMessageHeaderMapper;
+import org.springframework.integration.mail.MailHeaders;
 import org.springframework.integration.message.MessageHeaders;
 import org.springframework.util.ObjectUtils;
 
diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/MailTargetContextTests.java b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/MailTargetContextTests.java
similarity index 95%
rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/MailTargetContextTests.java
rename to org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/MailTargetContextTests.java
index a7fcfaa1d3..390fb8c5f8 100644
--- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/MailTargetContextTests.java
+++ b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/MailTargetContextTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.adapter.mail;
+package org.springframework.integration.mail;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
@@ -31,7 +31,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.integration.adapter.mail.MailTarget;
+import org.springframework.integration.mail.MailTarget;
 import org.springframework.integration.message.GenericMessage;
 import org.springframework.integration.message.StringMessage;
 import org.springframework.mail.SimpleMailMessage;
@@ -42,7 +42,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Marius Bogoevici
  */
 @RunWith(value = SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:/org/springframework/integration/adapter/mail/mailTarget.xml"})
+@ContextConfiguration(locations = {"classpath:/org/springframework/integration/mail/mailTarget.xml"})
 public class MailTargetContextTests {
 
 	@Autowired
diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/MailTargetTests.java b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/MailTargetTests.java
similarity index 95%
rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/MailTargetTests.java
rename to org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/MailTargetTests.java
index c361b44132..2e1278cb46 100644
--- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/MailTargetTests.java
+++ b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/MailTargetTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.adapter.mail;
+package org.springframework.integration.mail;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
@@ -31,6 +31,9 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import org.springframework.integration.mail.MailHeaders;
+import org.springframework.integration.mail.MailTarget;
+import org.springframework.integration.mail.StaticMailHeaderGenerator;
 import org.springframework.integration.message.GenericMessage;
 import org.springframework.integration.message.MessageBuilder;
 import org.springframework.integration.message.StringMessage;
diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/MailTestsHelper.java b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/MailTestsHelper.java
similarity index 96%
rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/MailTestsHelper.java
rename to org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/MailTestsHelper.java
index 0c14010c6c..001ef519b5 100644
--- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/MailTestsHelper.java
+++ b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/MailTestsHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.adapter.mail;
+package org.springframework.integration.mail;
 
 import org.springframework.mail.SimpleMailMessage;
 
diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/PollingMessageSourceTests.java b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/PollingMessageSourceTests.java
similarity index 92%
rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/PollingMessageSourceTests.java
rename to org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/PollingMessageSourceTests.java
index a71dde172b..c93d156112 100644
--- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/PollingMessageSourceTests.java
+++ b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/PollingMessageSourceTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.adapter.mail;
+package org.springframework.integration.mail;
 
 import static org.junit.Assert.*;
 
@@ -23,6 +23,10 @@ import javax.mail.internet.MimeMessage;
 
 import org.easymock.classextension.EasyMock;
 import org.junit.Test;
+
+import org.springframework.integration.mail.FolderConnection;
+import org.springframework.integration.mail.MailMessageConverter;
+import org.springframework.integration.mail.PollingMailSource;
 import org.springframework.integration.message.GenericMessage;
 import org.springframework.integration.message.Message;
 
diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/StubJavaMailSender.java b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/StubJavaMailSender.java
similarity index 98%
rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/StubJavaMailSender.java
rename to org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/StubJavaMailSender.java
index 6693c06309..b77da51ed9 100644
--- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/StubJavaMailSender.java
+++ b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/StubJavaMailSender.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.adapter.mail;
+package org.springframework.integration.mail;
 
 import java.io.InputStream;
 import java.util.ArrayList;
diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/SubscribableMailSourceTests.java b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/SubscribableMailSourceTests.java
similarity index 92%
rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/SubscribableMailSourceTests.java
rename to org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/SubscribableMailSourceTests.java
index 2c5c6c43a8..b0ae6d6474 100644
--- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/SubscribableMailSourceTests.java
+++ b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/SubscribableMailSourceTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.adapter.mail;
+package org.springframework.integration.mail;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -28,6 +28,9 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.integration.channel.QueueChannel;
+import org.springframework.integration.mail.FolderConnection;
+import org.springframework.integration.mail.MailMessageConverter;
+import org.springframework.integration.mail.SubscribableMailSource;
 import org.springframework.integration.message.GenericMessage;
 import org.springframework.integration.message.Message;
 import org.springframework.scheduling.concurrent.ConcurrentTaskExecutor;
diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/config/MailTargetParserTests.java b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/MailTargetParserTests.java
similarity index 93%
rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/config/MailTargetParserTests.java
rename to org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/MailTargetParserTests.java
index 5207715eed..8a10ec49b2 100644
--- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/config/MailTargetParserTests.java
+++ b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/MailTargetParserTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.adapter.mail.config;
+package org.springframework.integration.mail.config;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -24,8 +24,8 @@ import org.junit.Test;
 import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.integration.adapter.mail.MailHeaderGenerator;
-import org.springframework.integration.adapter.mail.MailTarget;
+import org.springframework.integration.mail.MailHeaderGenerator;
+import org.springframework.integration.mail.MailTarget;
 import org.springframework.integration.message.Message;
 import org.springframework.mail.MailMessage;
 import org.springframework.mail.MailSender;
diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/config/PollingMailSourceParserTests.java b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/PollingMailSourceParserTests.java
similarity index 89%
rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/config/PollingMailSourceParserTests.java
rename to org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/PollingMailSourceParserTests.java
index 6627f2ce1b..26fff9bbb3 100644
--- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/config/PollingMailSourceParserTests.java
+++ b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/PollingMailSourceParserTests.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.adapter.mail.config;
+package org.springframework.integration.mail.config;
 
 import org.junit.Test;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.integration.adapter.mail.PollingMailSource;
+import org.springframework.integration.mail.PollingMailSource;
 
 public class PollingMailSourceParserTests {
 	
diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/config/mailTargetParserTests.xml b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/mailTargetParserTests.xml
similarity index 52%
rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/config/mailTargetParserTests.xml
rename to org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/mailTargetParserTests.xml
index 2e705234da..36bf4e8ce6 100644
--- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/config/mailTargetParserTests.xml
+++ b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/mailTargetParserTests.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:si="http://www.springframework.org/schema/integration"
+	xmlns:mail="http://www.springframework.org/schema/integration/mail"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/mail
+			http://www.springframework.org/schema/integration/mail/spring-integration-mail-1.0.xsd">
 
-	<si:mail-target id="targetWithMailSenderReference" mail-sender="mailSender"/>
+	<mail:mail-target id="targetWithMailSenderReference" mail-sender="mailSender"/>
 
-	<si:mail-target id="targetWithHostProperty"
+	<mail:mail-target id="targetWithHostProperty"
 			host="somehost" username="someuser" password="somepassword"/>
 
-	<bean id="mailSender" class="org.springframework.integration.adapter.mail.StubJavaMailSender">
+	<bean id="mailSender" class="org.springframework.integration.mail.StubJavaMailSender">
 		<constructor-arg>
 			<bean class="javax.mail.internet.MimeMessage">
 				<constructor-arg type="javax.mail.Session"><null/></constructor-arg>
@@ -20,11 +20,11 @@
 		</constructor-arg>
 	</bean>
 
-	<si:mail-target id="targetWithHeaderGeneratorReference"
+	<mail:mail-target id="targetWithHeaderGeneratorReference"
 			mail-sender="mailSender"
 			header-generator="testHeaderGenerator"/>
 
 	<bean id="testHeaderGenerator"
-			class="org.springframework.integration.adapter.mail.config.MailTargetParserTests$TestHeaderGenerator"/>
+			class="org.springframework.integration.mail.config.MailTargetParserTests$TestHeaderGenerator"/>
 
 </beans>
\ No newline at end of file
diff --git a/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/pollingMailSourceParserTests.xml b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/pollingMailSourceParserTests.xml
new file mode 100644
index 0000000000..61660b74a8
--- /dev/null
+++ b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/pollingMailSourceParserTests.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/integration/mail"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:beans="http://www.springframework.org/schema/beans"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/integration/mail
+			http://www.springframework.org/schema/integration/mail/spring-integration-mail-1.0.xsd">
+
+	<polling-mail-source id="pollingPop3" store-uri="pop3://mailtest:mailtest@ubuntuservervm/INBOX" />
+
+</beans:beans>
diff --git a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/mailTarget.xml b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/mailTarget.xml
similarity index 67%
rename from org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/mailTarget.xml
rename to org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/mailTarget.xml
index c2a28ec92f..bfca978a37 100644
--- a/org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/mailTarget.xml
+++ b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/mailTarget.xml
@@ -3,11 +3,11 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:util="http://www.springframework.org/schema/util"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-		http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-		http://www.springframework.org/schema/util
-		http://www.springframework.org/schema/util/spring-util-2.5.xsd">
+			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/util
+			http://www.springframework.org/schema/util/spring-util-2.5.xsd">
 
-	<bean id="javaMailSender" class="org.springframework.integration.adapter.mail.StubJavaMailSender">
+	<bean id="javaMailSender" class="org.springframework.integration.mail.StubJavaMailSender">
 		<constructor-arg>
 			<bean class="javax.mail.internet.MimeMessage">
 				<constructor-arg type="javax.mail.Session"><null/></constructor-arg>
@@ -15,27 +15,27 @@
 		</constructor-arg>
 	</bean>
 
-	<bean id="mailTarget" class="org.springframework.integration.adapter.mail.MailTarget">
+	<bean id="mailTarget" class="org.springframework.integration.mail.MailTarget">
 		<constructor-arg ref="javaMailSender"/>
 		<property name="headerGenerator">
-			<bean class="org.springframework.integration.adapter.mail.StaticMailHeaderGenerator">
+			<bean class="org.springframework.integration.mail.StaticMailHeaderGenerator">
 				<property name="subject">
-					<util:constant static-field="org.springframework.integration.adapter.mail.MailTestsHelper.SUBJECT"/>
+					<util:constant static-field="org.springframework.integration.mail.MailTestsHelper.SUBJECT"/>
 				</property>
 				<property name="to">
-					<util:constant static-field="org.springframework.integration.adapter.mail.MailTestsHelper.TO"/>
+					<util:constant static-field="org.springframework.integration.mail.MailTestsHelper.TO"/>
 				</property>
 				<property name="cc">
-					<util:constant static-field="org.springframework.integration.adapter.mail.MailTestsHelper.CC"/>
+					<util:constant static-field="org.springframework.integration.mail.MailTestsHelper.CC"/>
 				</property>
 				<property name="bcc">
-					<util:constant static-field="org.springframework.integration.adapter.mail.MailTestsHelper.BCC"/>
+					<util:constant static-field="org.springframework.integration.mail.MailTestsHelper.BCC"/>
 				</property>
 				<property name="from">
-					<util:constant static-field="org.springframework.integration.adapter.mail.MailTestsHelper.FROM"/>
+					<util:constant static-field="org.springframework.integration.mail.MailTestsHelper.FROM"/>
 				</property>
 				<property name="replyTo">
-					<util:constant static-field="org.springframework.integration.adapter.mail.MailTestsHelper.REPLY_TO"/>
+					<util:constant static-field="org.springframework.integration.mail.MailTestsHelper.REPLY_TO"/>
 				</property>
 			</bean>
 		</property>