diff --git a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQMessage.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQMessage.java
index 75dac10480..cd03324596 100755
--- a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQMessage.java
+++ b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQMessage.java
@@ -311,6 +311,18 @@ public class ActiveMQMessage extends Message implements org.apache.activemq.Mess
     public Enumeration getPropertyNames() throws JMSException {
         try {
             Vector<String> result = new Vector<String>(this.getProperties().keySet());
+            if( getRedeliveryCounter()!=0 ) {
+                result.add("JMSXDeliveryCount");
+            }
+            if( getGroupID()!=null ) {
+                result.add("JMSXGroupID");
+            }
+            if( getGroupID()!=null ) {
+                result.add("JMSXGroupSeq");
+            }
+            if( getUserID()!=null ) {
+                result.add("JMSXUserID");
+            }
             return result.elements();
         } catch (IOException e) {
             throw JMSExceptionSupport.create(e);