diff --git a/spring-messaging/src/main/java/org/springframework/messaging/support/GenericMessage.java b/spring-messaging/src/main/java/org/springframework/messaging/support/GenericMessage.java
index ef429e6b8482020aa36c992b857d1cca765c224f..637378938eff0ccf7abff9d7ce3b2ce364bb1462 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/support/GenericMessage.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/support/GenericMessage.java
@@ -82,9 +82,15 @@ public class GenericMessage<T> implements Message<T>, Serializable {
 	}
 
 	public String toString() {
-		StringBuilder sb = new StringBuilder("[Headers=" + this.headers + "]");
-		sb.append("[Payload ").append(this.payload.getClass().getSimpleName());
-		sb.append(" content=").append(this.payload).append("]");
+		StringBuilder sb = new StringBuilder();
+		if (byte[].class.equals(this.payload.getClass())) {
+			sb.append("[Payload byte[").append(((byte[]) this.payload).length).append("]]");
+		}
+		else {
+			sb.append("[Payload ").append(this.payload.getClass().getSimpleName());
+			sb.append(" content=").append(this.payload).append("]");
+		}
+		sb.append("[Headers=" + this.headers + "]");
 		return sb.toString();
 	}