diff --git a/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/AxionJDBCAdapter.java b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/AxionJDBCAdapter.java
index f2dd3191fa..3a930cacbd 100755
--- a/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/AxionJDBCAdapter.java
+++ b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/AxionJDBCAdapter.java
@@ -43,6 +43,7 @@ public class AxionJDBCAdapter extends StreamJDBCAdapter {
                            +", PRIMARY KEY ( ID ) )",                          
                      "CREATE INDEX "+getTablePrefix()+messageTableName+"_MIDX ON "+getTablePrefix()+messageTableName+" (MSGID_PROD,MSGID_SEQ)",
                      "CREATE INDEX "+getTablePrefix()+messageTableName+"_CIDX ON "+getTablePrefix()+messageTableName+" (CONTAINER)",                                       
+                     "CREATE INDEX "+getFullMessageTableName()+"_EIDX ON "+getFullMessageTableName()+" (EXPIRATION)",                 
                      "CREATE TABLE "+getTablePrefix()+durableSubAcksTableName+"("
                            +"CONTAINER "+containerNameDataType+" NOT NULL"
                            +", CLIENT_ID "+stringIdDataType+" NOT NULL"
diff --git a/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultStatementProvider.java b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultStatementProvider.java
index 618dc846cb..655c873997 100755
--- a/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultStatementProvider.java
+++ b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultStatementProvider.java
@@ -50,7 +50,8 @@ public class DefaultStatementProvider implements StatementProvider {
             			   +", MSG "+(useExternalMessageReferences ? stringIdDataType : binaryDataType)
             			   +", PRIMARY KEY ( ID ) )",						   
             "CREATE INDEX "+getFullMessageTableName()+"_MIDX ON "+getFullMessageTableName()+" (MSGID_PROD,MSGID_SEQ)",
-            "CREATE INDEX "+getFullMessageTableName()+"_CIDX ON "+getFullMessageTableName()+" (CONTAINER)",			
+            "CREATE INDEX "+getFullMessageTableName()+"_CIDX ON "+getFullMessageTableName()+" (CONTAINER)",		
+            "CREATE INDEX "+getFullMessageTableName()+"_EIDX ON "+getFullMessageTableName()+" (EXPIRATION)",                 
             "CREATE TABLE "+getTablePrefix()+durableSubAcksTableName+"("
                         +"CONTAINER "+containerNameDataType+" NOT NULL"
                         +", CLIENT_ID "+stringIdDataType+" NOT NULL"