diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/MessageTimeoutException.java b/spring-integration-core/src/main/java/org/springframework/integration/MessageTimeoutException.java
similarity index 88%
rename from spring-integration-core/src/main/java/org/springframework/integration/message/MessageTimeoutException.java
rename to spring-integration-core/src/main/java/org/springframework/integration/MessageTimeoutException.java
index 7aa7421874..f67e782a4b 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/message/MessageTimeoutException.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/MessageTimeoutException.java
@@ -14,10 +14,8 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.message;
+package org.springframework.integration;
 
-import org.springframework.integration.Message;
-import org.springframework.integration.MessageHandlingException;
 
 /**
  * @author Mark Fisher
diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsOutboundGateway.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsOutboundGateway.java
index 42efbcea7f..6f3dd309f5 100644
--- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsOutboundGateway.java
+++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsOutboundGateway.java
@@ -31,10 +31,10 @@ import javax.jms.Topic;
 
 import org.springframework.integration.Message;
 import org.springframework.integration.MessageHandlingException;
+import org.springframework.integration.MessageTimeoutException;
 import org.springframework.integration.core.MessageBuilder;
 import org.springframework.integration.core.MessageChannel;
 import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
-import org.springframework.integration.message.MessageTimeoutException;
 import org.springframework.jms.connection.ConnectionFactoryUtils;
 import org.springframework.jms.support.JmsUtils;
 import org.springframework.jms.support.converter.MessageConverter;