diff --git a/src/kits/app/MessageUtils.cpp b/src/kits/app/MessageUtils.cpp
index e41b7c722d..47b612514b 100644
--- a/src/kits/app/MessageUtils.cpp
+++ b/src/kits/app/MessageUtils.cpp
@@ -22,11 +22,7 @@ CalculateChecksum(const uint8 *buffer, int32 size)
 	uint32 temp = 0;
 
 	while (size > 3) {
-#if defined(__i386__)
-		sum += B_SWAP_INT32(*(int32 *)buffer);
-#else
-		sum += *(int32 *)buffer;
-#endif
+		sum += B_BENDIAN_TO_HOST_INT32(*(int32 *)buffer);
 		buffer += 4;
 		size -= 4;
 	}