diff --git a/src/kits/app/Message.cpp b/src/kits/app/Message.cpp
index ab4d46f0c5..5da3f341ac 100644
--- a/src/kits/app/Message.cpp
+++ b/src/kits/app/Message.cpp
@@ -926,7 +926,8 @@ BMessage::Unflatten(const char* buffer)
 
 	if (magic == kMessageMagicDano || magic == kMessageMagicDanoSwapped) {
 		// dano style message
-		BMemoryIO memoryStream(buffer, BPrivate::dano_message_size(buffer));
+		BMemoryIO memoryStream(buffer,
+			BPrivate::dano_message_flattened_size(buffer));
 		return Unflatten(&memoryStream);
 	}