diff --git a/src/servers/app/ServerApp.cpp b/src/servers/app/ServerApp.cpp
index dd6fab462e..d43e82d0d7 100644
--- a/src/servers/app/ServerApp.cpp
+++ b/src/servers/app/ServerApp.cpp
@@ -1401,8 +1401,7 @@ ServerApp::_DispatchMessage(int32 code, BPrivate::LinkReceiver& link)
 			int32 lengthArray[numStrings];
 			char *stringArray[numStrings];
 			for (int32 i = 0; i < numStrings; i++) {
-// TODO: who allocates the strings?!? If the link does it then we are leaking
-// everywhere else!!
+				// This version of ReadString allocates the strings, we free them below
 				link.ReadString(&stringArray[i], (size_t *)&lengthArray[i]);
 			}
 
@@ -1982,9 +1981,9 @@ ServerApp::_DispatchMessage(int32 code, BPrivate::LinkReceiver& link)
 			char *stringArray[numStrings];
 			int32 lengthArray[numStrings];
 			for(int32 i=0; i<numStrings; i++) {
-				link.Read<int32>(&lengthArray[i]);
+				// This version of ReadString allocates the strings, we free them below
+				link.ReadString(&stringArray[i], (size_t *)&lengthArray[i]);
 				link.Read<escapement_delta>(&deltaArray[i]);
-				link.ReadString(&stringArray[i]);
 			}
 
 			BRect rectArray[numStrings];
@@ -1999,7 +1998,6 @@ ServerApp::_DispatchMessage(int32 code, BPrivate::LinkReceiver& link)
 				font.SetSpacing(spacing);
 				font.SetFlags(flags);
 
-				// TODO implement for real
 				if (font.GetBoundingBoxesForStrings(stringArray, lengthArray,
 					numStrings, rectArray, mode, deltaArray) == B_OK) {
 					fLink.StartMessage(B_OK);
diff --git a/src/servers/app/ServerFont.cpp b/src/servers/app/ServerFont.cpp
index 35f5dfe3bb..44202ba3ae 100644
--- a/src/servers/app/ServerFont.cpp
+++ b/src/servers/app/ServerFont.cpp
@@ -24,6 +24,8 @@
 #include <String.h>
 #include <UTF8.h>
 
+#include <stdio.h>
+#include <string.h>
 
 // functions needed to convert a freetype vector graphics to a BShape
 inline BPoint
@@ -496,6 +498,7 @@ ServerFont::GetBoundingBoxesAsString(const char charArray[], int32 numChars,
 	BRect rectArray[], bool stringEscapement, font_metric_mode mode,
 	escapement_delta delta)
 {
+	// TODO: The mode is never used
 	if (!charArray || numChars <= 0 || !rectArray)
 		return B_BAD_DATA;
 
@@ -519,12 +522,12 @@ ServerFont::GetBoundingBoxesAsString(const char charArray[], int32 numChars,
 				+ face->glyph->metrics.horiAdvance / 64.0;
 		}
 
-		rectArray[i].left += float(face->glyph->metrics.horiBearingX) /64.0;
+		rectArray[i].left += float(face->glyph->metrics.horiBearingX) / 64.0;
 		rectArray[i].right += float(face->glyph->metrics.horiBearingX
 			+ face->glyph->metrics.width) / 64.0;
 		rectArray[i].top = -float(face->glyph->metrics.horiBearingY) / 64.0;
 		rectArray[i].bottom = float(face->glyph->metrics.height
-			- face->glyph->metrics.horiBearingY) /64.0;
+			- face->glyph->metrics.horiBearingY) / 64.0;
 	}
 
 	PutTransformedFace(face);
@@ -536,6 +539,7 @@ status_t
 ServerFont::GetBoundingBoxesForStrings(char *charArray[], int32 lengthArray[], 
 	int32 numStrings, BRect rectArray[], font_metric_mode mode, escapement_delta deltaArray[])
 {
+	// TODO: The mode is never used
 	if (!charArray || !lengthArray|| numStrings <= 0 || !rectArray || !deltaArray)
 		return B_BAD_DATA;
 
@@ -544,7 +548,28 @@ ServerFont::GetBoundingBoxesForStrings(char *charArray[], int32 lengthArray[],
 		return B_ERROR;
 
 	for (int32 i = 0; i < numStrings; i++) {
-		// TODO: ...
+		int32 numChars = lengthArray[i];
+		const char *string = charArray[i];
+		escapement_delta delta = deltaArray[i];
+
+		rectArray[i].left = 0.0;
+		for (int32 j = 0; j < numChars; j++) {
+			uint32 charCode = UTF8ToCharCode(&string);
+			FT_Load_Char(face, charCode, FT_LOAD_NO_BITMAP);
+
+			// TODO: In my testing the width doesn't seem quite right (a
+			// little too long), though I need to do more comparisions with BeOS
+			rectArray[i].right += (face->glyph->advance.x >> 6);
+			rectArray[i].right += is_white_space(charCode) ? delta.space : delta.nonspace;
+
+			float top = -(face->glyph->metrics.horiBearingY >> 6);
+			if (top < rectArray[i].top)
+				rectArray[i].top = top;
+			float bottom = (face->glyph->metrics.height
+				- face->glyph->metrics.horiBearingY) >> 6;
+			if (bottom > rectArray[i].bottom)
+				rectArray[i].bottom = bottom;
+		}
 	}
 
 	PutTransformedFace(face);