diff --git a/spring-integration-core/src/main/java/org/springframework/integration/store/MessageStore.java b/spring-integration-core/src/main/java/org/springframework/integration/store/MessageStore.java
index f5caa96edb..35e323856f 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/store/MessageStore.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/store/MessageStore.java
@@ -61,6 +61,6 @@ public interface MessageStore {
 	 * @throws UnsupportedOperationException if not implemented
 	 */
 	@ManagedAttribute
-	int getMessageCount();
+	long getMessageCount();
 
 }
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/store/SimpleMessageStore.java b/spring-integration-core/src/main/java/org/springframework/integration/store/SimpleMessageStore.java
index 795968af57..7abbb3edc4 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/store/SimpleMessageStore.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/store/SimpleMessageStore.java
@@ -76,7 +76,7 @@ public class SimpleMessageStore extends AbstractMessageGroupStore implements Mes
 	}
 
 	@ManagedAttribute
-	public int getMessageCount() {
+	public long getMessageCount() {
 		return idToMessage.size();
 	}
 
diff --git a/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/store/GemfireMessageStore.java b/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/store/GemfireMessageStore.java
index 222f5efa1f..4f12ed92e2 100644
--- a/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/store/GemfireMessageStore.java
+++ b/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/store/GemfireMessageStore.java
@@ -50,7 +50,7 @@ public class GemfireMessageStore implements MessageStore {
 		return this.region.remove(id);
 	}
 
-	public int getMessageCount() {
+	public long getMessageCount() {
 		return this.region.size();
 	}
 
diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageStore.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageStore.java
index 4adba94308..5e6db1dc1f 100644
--- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageStore.java
+++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageStore.java
@@ -249,7 +249,7 @@ public class JdbcMessageStore extends AbstractMessageGroupStore implements Messa
 	}
 
 	@ManagedAttribute
-	public int getMessageCount() {
+	public long getMessageCount() {
 		return jdbcTemplate.queryForInt(getQuery(GET_MESSAGE_COUNT), region);
 	}
 
diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoDbMessageStore.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoDbMessageStore.java
index 14b8bd7a1a..78e9ab2f7f 100644
--- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoDbMessageStore.java
+++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoDbMessageStore.java
@@ -89,7 +89,7 @@ public class MongoDbMessageStore implements MessageStore, BeanClassLoaderAware {
 		return this.template.findOne(this.idQuery(id), Message.class, this.collectionName);
 	}
 
-	public int getMessageCount() {
+	public long getMessageCount() {
 		// TODO: long to int
 		return new Long(this.template.getCollection(DEFAULT_COLLECTION_NAME).getCount()).intValue();
 	}
diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/store/RedisMessageStore.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/store/RedisMessageStore.java
index 1fb96e05a0..de2fbfd7b6 100644
--- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/store/RedisMessageStore.java
+++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/store/RedisMessageStore.java
@@ -106,7 +106,7 @@ public class RedisMessageStore extends AbstractMessageGroupStore implements Mess
 	}
 
 	
-	public int getMessageCount() {
+	public long getMessageCount() {
 		return redisTemplate.execute(new RedisCallback<Integer>() {
 			public Integer doInRedis(RedisConnection connection)
 					throws DataAccessException {