diff --git a/src/apps/debugger/value/TypeHandlerRoster.cpp b/src/apps/debugger/value/TypeHandlerRoster.cpp
index e37852e12b..eda2839ba7 100644
--- a/src/apps/debugger/value/TypeHandlerRoster.cpp
+++ b/src/apps/debugger/value/TypeHandlerRoster.cpp
@@ -151,7 +151,7 @@ TypeHandlerRoster::RegisterDefaultHandlers()
 			return B_NO_MEMORY;
 
 	REGISTER_SPECIALIZED_HANDLER(CString);
-//	REGISTER_SPECIALIZED_HANDLER(BMessage);
+	REGISTER_SPECIALIZED_HANDLER(BMessage);
 
 	return B_OK;
 }
diff --git a/src/apps/debugger/value/value_nodes/BMessageValueNode.cpp b/src/apps/debugger/value/value_nodes/BMessageValueNode.cpp
index ade0c667bf..d9b0e43e09 100644
--- a/src/apps/debugger/value/value_nodes/BMessageValueNode.cpp
+++ b/src/apps/debugger/value/value_nodes/BMessageValueNode.cpp
@@ -436,8 +436,9 @@ BMessageValueNode::_GetTypeForTypeCode(type_code type,
 			break;
 
 		case B_POINTER_TYPE:
-			typeName = "void";
+			typeName = "";
 			constraints.SetTypeKind(TYPE_ADDRESS);
+			constraints.SetBaseTypeName("void");
 			break;
 
 		case B_RECT_TYPE:
@@ -456,8 +457,9 @@ BMessageValueNode::_GetTypeForTypeCode(type_code type,
 			break;
 
 		case B_STRING_TYPE:
-			typeName = "char";
+			typeName = "";
 			constraints.SetTypeKind(TYPE_ARRAY);
+			constraints.SetBaseTypeName("char");
 			break;
 
 		default: