diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java
index 5b07ea60ad..4ca4449db1 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java
@@ -29,11 +29,11 @@ import org.springframework.core.convert.ConversionService;
 import org.springframework.integration.Message;
 import org.springframework.integration.MessageDeliveryException;
 import org.springframework.integration.MessagingException;
-import org.springframework.integration.context.TrackableComponent;
 import org.springframework.integration.context.IntegrationObjectSupport;
 import org.springframework.integration.core.MessageBuilder;
 import org.springframework.integration.core.MessageChannel;
-import org.springframework.integration.core.MessageHistory;
+import org.springframework.integration.history.MessageHistory;
+import org.springframework.integration.history.TrackableComponent;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/MessageHistoryParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/MessageHistoryParser.java
index 7d6e453ef6..80f44bd5d5 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/MessageHistoryParser.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/MessageHistoryParser.java
@@ -30,7 +30,7 @@ import org.springframework.beans.factory.xml.ParserContext;
  */
 public class MessageHistoryParser extends AbstractSimpleBeanDefinitionParser {
 
-	private static final String POST_PROCESSOR_CLASSNAME = "org.springframework.integration.context.MessageHistoryBeanPostProcessor";
+	private static final String POST_PROCESSOR_CLASSNAME = "org.springframework.integration.history.MessageHistoryBeanPostProcessor";
 
 
 	@Override
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MessageProducerSupport.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MessageProducerSupport.java
index 1f069b5279..5fc8bfafc4 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MessageProducerSupport.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MessageProducerSupport.java
@@ -18,9 +18,9 @@ package org.springframework.integration.endpoint;
 
 import org.springframework.integration.Message;
 import org.springframework.integration.core.MessageChannel;
-import org.springframework.integration.core.MessageHistory;
 import org.springframework.integration.core.MessageProducer;
 import org.springframework.integration.core.MessagingTemplate;
+import org.springframework.integration.history.MessageHistory;
 import org.springframework.util.Assert;
 
 /**
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java
index a7730d256b..c3db143892 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java
@@ -37,12 +37,12 @@ import org.springframework.expression.Expression;
 import org.springframework.integration.Message;
 import org.springframework.integration.annotation.Gateway;
 import org.springframework.integration.context.BeanFactoryChannelResolver;
-import org.springframework.integration.context.TrackableComponent;
 import org.springframework.integration.context.IntegrationContextUtils;
 import org.springframework.integration.core.ChannelResolver;
 import org.springframework.integration.core.MessageChannel;
 import org.springframework.integration.endpoint.AbstractEndpoint;
 import org.springframework.integration.handler.ArgumentArrayMessageMapper;
+import org.springframework.integration.history.TrackableComponent;
 import org.springframework.integration.mapping.InboundMessageMapper;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java
index fb4fe6c16c..c5e4bcbc78 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java
@@ -18,8 +18,8 @@ package org.springframework.integration.gateway;
 
 import org.springframework.integration.Message;
 import org.springframework.integration.MessagingException;
-import org.springframework.integration.context.TrackableComponent;
-import org.springframework.integration.core.MessageHistory;
+import org.springframework.integration.history.MessageHistory;
+import org.springframework.integration.history.TrackableComponent;
 import org.springframework.integration.mapping.InboundMessageMapper;
 import org.springframework.integration.mapping.OutboundMessageMapper;
 import org.springframework.util.Assert;
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java
index 1ca9364493..6116738ded 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java
@@ -23,10 +23,10 @@ import org.springframework.core.Ordered;
 import org.springframework.integration.Message;
 import org.springframework.integration.MessageHandlingException;
 import org.springframework.integration.MessagingException;
-import org.springframework.integration.context.TrackableComponent;
 import org.springframework.integration.context.IntegrationObjectSupport;
 import org.springframework.integration.core.MessageHandler;
-import org.springframework.integration.core.MessageHistory;
+import org.springframework.integration.history.MessageHistory;
+import org.springframework.integration.history.TrackableComponent;
 import org.springframework.util.Assert;
 
 /**
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/core/MessageHistory.java b/spring-integration-core/src/main/java/org/springframework/integration/history/MessageHistory.java
similarity index 98%
rename from spring-integration-core/src/main/java/org/springframework/integration/core/MessageHistory.java
rename to spring-integration-core/src/main/java/org/springframework/integration/history/MessageHistory.java
index fb9a4e2ffc..f277be43fd 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/core/MessageHistory.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/history/MessageHistory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.core;
+package org.springframework.integration.history;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -27,6 +27,7 @@ import java.util.Properties;
 import org.springframework.integration.Message;
 import org.springframework.integration.MessageHeaders;
 import org.springframework.integration.context.NamedComponent;
+import org.springframework.integration.core.MessageBuilder;
 import org.springframework.util.Assert;
 
 /**
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/context/MessageHistoryBeanPostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/history/MessageHistoryBeanPostProcessor.java
similarity index 96%
rename from spring-integration-core/src/main/java/org/springframework/integration/context/MessageHistoryBeanPostProcessor.java
rename to spring-integration-core/src/main/java/org/springframework/integration/history/MessageHistoryBeanPostProcessor.java
index 2393fe8d17..a70dac7047 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/context/MessageHistoryBeanPostProcessor.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/history/MessageHistoryBeanPostProcessor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.context;
+package org.springframework.integration.history;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.BeanPostProcessor;
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/context/TrackableComponent.java b/spring-integration-core/src/main/java/org/springframework/integration/history/TrackableComponent.java
similarity index 87%
rename from spring-integration-core/src/main/java/org/springframework/integration/context/TrackableComponent.java
rename to spring-integration-core/src/main/java/org/springframework/integration/history/TrackableComponent.java
index 3920fe827f..6e040ceaf4 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/context/TrackableComponent.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/history/TrackableComponent.java
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.context;
+package org.springframework.integration.history;
+
+import org.springframework.integration.context.NamedComponent;
 
 /**
  * @author Mark Fisher
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/history/MessageHistoryIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/history/MessageHistoryIntegrationTests.java
index ee492b0f01..96360dc145 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/history/MessageHistoryIntegrationTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/history/MessageHistoryIntegrationTests.java
@@ -40,7 +40,6 @@ import org.springframework.integration.channel.DirectChannel;
 import org.springframework.integration.config.ConsumerEndpointFactoryBean;
 import org.springframework.integration.core.MessageChannel;
 import org.springframework.integration.core.MessageHandler;
-import org.springframework.integration.core.MessageHistory;
 
 /**
  * @author Oleg Zhurakousky
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/history/messageHistoryWithHistoryWriter.xml b/spring-integration-core/src/test/java/org/springframework/integration/history/messageHistoryWithHistoryWriter.xml
index 31a43d5240..7b42faf2af 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/history/messageHistoryWithHistoryWriter.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/history/messageHistoryWithHistoryWriter.xml
@@ -30,5 +30,6 @@
 	
 	<int:channel id="endOfThePipeChannel"/>
 	
-	<bean class="org.springframework.integration.context.MessageHistoryBeanPostProcessor"/>
+	<bean class="org.springframework.integration.history.MessageHistoryBeanPostProcessor"/>
+
 </beans>
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/history/messageHistoryWithHistoryWriterNamespace.xml b/spring-integration-core/src/test/java/org/springframework/integration/history/messageHistoryWithHistoryWriterNamespace.xml
index 18e599a38a..bf589cfe11 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/history/messageHistoryWithHistoryWriterNamespace.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/history/messageHistoryWithHistoryWriterNamespace.xml
@@ -31,4 +31,5 @@
 	<int:channel id="endOfThePipeChannel"/>
 	
 	<int:message-history/>
+
 </beans>
diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListener.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListener.java
index c3bdf8bfc5..f381cd5b48 100644
--- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListener.java
+++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListener.java
@@ -28,8 +28,8 @@ import javax.jms.Session;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.integration.Message;
 import org.springframework.integration.core.MessageBuilder;
-import org.springframework.integration.core.MessageHistory;
 import org.springframework.integration.gateway.AbstractMessagingGateway;
+import org.springframework.integration.history.MessageHistory;
 import org.springframework.jms.listener.SessionAwareMessageListener;
 import org.springframework.jms.support.converter.MessageConverter;
 import org.springframework.jms.support.destination.DestinationResolver;
diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsDestinationPollingSource.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsDestinationPollingSource.java
index 2b007b7779..83b7235c3e 100644
--- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsDestinationPollingSource.java
+++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsDestinationPollingSource.java
@@ -24,8 +24,8 @@ import javax.jms.Destination;
 import org.springframework.integration.Message;
 import org.springframework.integration.MessagingException;
 import org.springframework.integration.core.MessageBuilder;
-import org.springframework.integration.core.MessageHistory;
 import org.springframework.integration.core.MessageSource;
+import org.springframework.integration.history.MessageHistory;
 import org.springframework.jms.core.JmsTemplate;
 import org.springframework.jms.support.converter.MessageConverter;
 
diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsSendingMessageHandler.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsSendingMessageHandler.java
index 2d0b0fd507..a91e7e70e4 100644
--- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsSendingMessageHandler.java
+++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsSendingMessageHandler.java
@@ -21,7 +21,7 @@ import javax.jms.JMSException;
 import org.springframework.core.Ordered;
 import org.springframework.integration.Message;
 import org.springframework.integration.core.MessageHandler;
-import org.springframework.integration.core.MessageHistory;
+import org.springframework.integration.history.MessageHistory;
 import org.springframework.jms.core.JmsTemplate;
 import org.springframework.jms.core.MessagePostProcessor;
 
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageHistoryTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageHistoryTests.java
index 03d0ebb24a..b01ce1e1e8 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageHistoryTests.java
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageHistoryTests.java
@@ -38,10 +38,10 @@ import org.springframework.integration.channel.DirectChannel;
 import org.springframework.integration.context.NamedComponent;
 import org.springframework.integration.core.MessageChannel;
 import org.springframework.integration.core.MessageHandler;
-import org.springframework.integration.core.MessageHistory;
 import org.springframework.integration.core.PollableChannel;
 import org.springframework.integration.core.StringMessage;
 import org.springframework.integration.core.SubscribableChannel;
+import org.springframework.integration.history.MessageHistory;
 import org.springframework.integration.jms.DefaultJmsHeaderMapper;
 
 /**
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/MessageHistoryTests-context.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/MessageHistoryTests-context.xml
index 5a5f99139b..c52d5b71ef 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/MessageHistoryTests-context.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/MessageHistoryTests-context.xml
@@ -40,6 +40,6 @@
 		<property name="cacheProducers" value="false"/>
 	</bean>
 	
-	<bean class="org.springframework.integration.context.MessageHistoryBeanPostProcessor"/>
+	<bean class="org.springframework.integration.history.MessageHistoryBeanPostProcessor"/>
 
 </beans>