diff --git a/src/kits/app/MessageAdapter.cpp b/src/kits/app/MessageAdapter.cpp
index 2626b15618..c555e58644 100644
--- a/src/kits/app/MessageAdapter.cpp
+++ b/src/kits/app/MessageAdapter.cpp
@@ -180,6 +180,7 @@ MessageAdapter::Unflatten(uint32 format, BMessage *into, const char *buffer)
 			case MESSAGE_FORMAT_R5:
 			{
 				r5_message_header *header = (r5_message_header *)buffer;
+				debug_printf("creating memory io for message buffer %p with flattened size %ld\n", buffer, header->flattened_size);
 				BMemoryIO stream(buffer + sizeof(uint32),
 					header->flattened_size - sizeof(uint32));
 				return _UnflattenR5Message(format, into, &stream);
@@ -188,6 +189,7 @@ MessageAdapter::Unflatten(uint32 format, BMessage *into, const char *buffer)
 			case MESSAGE_FORMAT_R5_SWAPPED:
 			{
 				r5_message_header *header = (r5_message_header *)buffer;
+				debug_printf("creating swapped memory io for message buffer %p with flattened size %ld\n", buffer, header->flattened_size);
 				BMemoryIO stream(buffer + sizeof(uint32),
 					__swap_int32(header->flattened_size) - sizeof(uint32));
 				return _UnflattenR5Message(format, into, &stream);
@@ -519,13 +521,13 @@ MessageAdapter::_UnflattenR5Message(uint32 format, BMessage *into,
 
 	header->what = into->what = r5header.what;
 	if (r5header.flags & R5_MESSAGE_FLAG_INCLUDE_TARGET)
-		reader(header->target, sizeof(header->target));
+		reader(header->target);
 
 	if (r5header.flags & R5_MESSAGE_FLAG_INCLUDE_REPLY) {
 		// reply info
-		reader(header->reply_port, sizeof(header->reply_port));
-		reader(header->reply_target, sizeof(header->reply_target));
-		reader(header->reply_team, sizeof(header->reply_team));
+		reader(header->reply_port);
+		reader(header->reply_target);
+		reader(header->reply_team);
 
 		// big flags
 		uint8 bigFlag;