1 files changed, 6 insertions, 2 deletions
diff --git a/qpid/cpp/examples/messaging/drain.cpp b/qpid/cpp/examples/messaging/drain.cpp
index fe4ea7950d..6ac1d3a236 100644
--- a/qpid/cpp/examples/messaging/drain.cpp
+++ b/qpid/cpp/examples/messaging/drain.cpp
@@ -92,11 +92,15 @@ int main(int argc, char** argv)
             int i = 0;
 
             while (receiver.fetch(message, timeout)) {
-                std::cout << "Message(properties=" << message.getProperties() << ", content='" ;
+                std::cout << "Message(properties=" << message.getProperties();
+                if (!message.getSubject().empty()) {
+                    std::cout << ", subject='" << message.getSubject() << "'";
+                }
+                std::cout << ", content='";
                 if (message.getContentType() == "amqp/map") {
                     std::cout << message.getContentObject().asMap();
                 } else {
-                    std::cout << message.getContent();
+                    std::cout << message.getContentObject();
                 }
                 std::cout  << "')" << std::endl;
                 session.acknowledge();