2 files changed, 22 insertions, 6 deletions

diff --git a/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp b/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp
index e66dc5915c..669ffd7e9a 100644
--- a/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp
+++ b/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp
@@ -264,22 +264,32 @@ void IncomingMessages::MessageTransfer::retrieve(qpid::messaging::Message* messa
     parent.retrieve(content, message);
 }
 
+
+namespace {
+//TODO: unify conversion to and from 0-10 message that is currently
+//split between IncomingMessages and OutgoingMessage
+const std::string SUBJECT("subject");
+}
+
 void populateHeaders(qpid::messaging::Message& message, 
                      const DeliveryProperties* deliveryProperties, 
                      const MessageProperties* messageProperties)
 {
     if (deliveryProperties) {
-        message.setSubject(deliveryProperties->getRoutingKey());
-        //TODO: convert other delivery properties
+        message.setTtl(deliveryProperties->getTtl());
+        message.setDurable(deliveryProperties->getDeliveryMode() == DELIVERY_MODE_PERSISTENT);
+        MessageImplAccess::get(message).redelivered = deliveryProperties->getRedelivered();
     }
     if (messageProperties) {
         message.setContentType(messageProperties->getContentType());
         if (messageProperties->hasReplyTo()) {
             message.setReplyTo(AddressResolution::convert(messageProperties->getReplyTo()));
         }
+        message.setSubject(messageProperties->getApplicationHeaders().getAsString(SUBJECT));
         message.getHeaders().clear();
         translate(messageProperties->getApplicationHeaders(), message.getHeaders());
-        //TODO: convert other message properties
+        message.setCorrelationId(messageProperties->getCorrelationId());
+        message.setUserId(messageProperties->getUserId());
     }
 }
 
diff --git a/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp b/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp
index abd4f4c28c..4065a16c6d 100644
--- a/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp
+++ b/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp
@@ -25,6 +25,7 @@
 #include "qpid/messaging/Address.h"
 #include "qpid/messaging/Message.h"
 #include "qpid/messaging/MessageImpl.h"
+#include "qpid/framing/enum.h"
 
 namespace qpid {
 namespace client {
@@ -32,20 +33,25 @@ namespace amqp0_10 {
 
 using qpid::messaging::Address;
 using qpid::messaging::MessageImplAccess;
+using namespace qpid::framing::message;
 
 void OutgoingMessage::convert(const qpid::messaging::Message& from)
 {
     //TODO: need to avoid copying as much as possible
     message.setData(from.getContent());
     message.getMessageProperties().setContentType(from.getContentType());
+    message.getMessageProperties().setCorrelationId(from.getCorrelationId());
+    message.getMessageProperties().setUserId(from.getUserId());
     const Address& address = from.getReplyTo();
     if (address) {
         message.getMessageProperties().setReplyTo(AddressResolution::convert(address));
     }
     translate(from.getHeaders(), message.getMessageProperties().getApplicationHeaders());
-    //TODO: set other message properties
-    message.getDeliveryProperties().setRoutingKey(from.getSubject());
-    //TODO: set other delivery properties
+    message.getDeliveryProperties().setTtl(from.getTtl());
+    if (from.getDurable()) {
+        message.getDeliveryProperties().setDeliveryMode(DELIVERY_MODE_PERSISTENT);
+    }
+
 }
 
 namespace {