Merge branch 'sprint90'
diff --git a/org.eclipse.ote.ui.message/src/org/eclipse/ote/ui/message/watch/DetailsBox.java b/org.eclipse.ote.ui.message/src/org/eclipse/ote/ui/message/watch/DetailsBox.java
index 34979fc..dff2200 100644
--- a/org.eclipse.ote.ui.message/src/org/eclipse/ote/ui/message/watch/DetailsBox.java
+++ b/org.eclipse.ote.ui.message/src/org/eclipse/ote/ui/message/watch/DetailsBox.java
@@ -344,7 +344,7 @@
       strBuilder.append(PAYLOAD_TXT);
       int payloadStart = strBuilder.length();
       columnCount = 0;
-      for (int i = msg.getHeaderSize(); i < msg.getHeaderSize() + msg.getPayloadSize(); i++) {
+      for (int i = msg.getHeaderSize(); i < data.length; i++) {
          if (columnCount == HEX_DUMP_BYTES_PER_ROW) {
             strBuilder.append('\n').append(String.format("%5d:  ", i - msg.getHeaderSize()));
             columnCount = 0;