diff --git a/src/apps/haiku-depot/Jamfile b/src/apps/haiku-depot/Jamfile
index 97499e2689..4a548446b6 100644
--- a/src/apps/haiku-depot/Jamfile
+++ b/src/apps/haiku-depot/Jamfile
@@ -2,6 +2,16 @@ SubDir HAIKU_TOP src apps haiku-depot ;
 
 UsePrivateHeaders interface shared ;
 
+# source directories
+local sourceDirs =
+	textview
+;
+
+local sourceDir ;
+for sourceDir in $(sourceDirs) {
+	SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src apps haiku-depot $(sourceDir) ] ;
+}
+
 Application HaikuDepot :
 	App.cpp
 	FilterView.cpp
@@ -13,6 +23,10 @@ Application HaikuDepot :
 	PackageListView.cpp
 	PackageManager.cpp
 	support.cpp
+
+	TextLayout.cpp
+	TextView.cpp
+	
 	: be translation libcolumnlistview.a libshared.a $(TARGET_LIBSUPC++)
 		$(HAIKU_LOCALE_LIBS)
 	: HaikuDepot.rdef
diff --git a/src/apps/haiku-depot/textview/TextLayout.cpp b/src/apps/haiku-depot/textview/TextLayout.cpp
new file mode 100644
index 0000000000..6ce034289d
--- /dev/null
+++ b/src/apps/haiku-depot/textview/TextLayout.cpp
@@ -0,0 +1,499 @@
+/*
+ * Copyright 2013, Stephan Aßmus <superstippi@gmx.de>.
+ * All rights reserved. Distributed under the terms of the MIT License.
+ */
+
+#include "TextLayout.h"
+
+#include <new>
+
+#include <AutoDeleter.h>
+#include <utf8_functions.h>
+#include <View.h>
+
+#include "List.h"
+
+
+enum {
+	CHAR_CLASS_DEFAULT,
+	CHAR_CLASS_WHITESPACE,
+	CHAR_CLASS_GRAPHICAL,
+	CHAR_CLASS_QUOTE,
+	CHAR_CLASS_PUNCTUATION,
+	CHAR_CLASS_PARENS_OPEN,
+	CHAR_CLASS_PARENS_CLOSE,
+	CHAR_CLASS_END_OF_TEXT
+};
+
+
+static uint32
+get_char_classification(uint32 charCode)
+{
+	// TODO: Should check against a list of characters containing also
+	// word breakers from other languages.
+
+	switch (charCode) {
+		case '\0':
+			return CHAR_CLASS_END_OF_TEXT;
+
+		case ' ':
+		case '\t':
+		case '\n':
+			return CHAR_CLASS_WHITESPACE;
+
+		case '=':
+		case '+':
+		case '@':
+		case '#':
+		case '$':
+		case '%':
+		case '^':
+		case '&':
+		case '*':
+		case '\\':
+		case '|':
+		case '<':
+		case '>':
+		case '/':
+		case '~':
+			return CHAR_CLASS_GRAPHICAL;
+
+		case '\'':
+		case '"':
+			return CHAR_CLASS_QUOTE;
+
+		case ',':
+		case '.':
+		case '?':
+		case '!':
+		case ';':
+		case ':':
+		case '-':
+			return CHAR_CLASS_PUNCTUATION;
+
+		case '(':
+		case '[':
+		case '{':
+			return CHAR_CLASS_PARENS_OPEN;
+
+		case ')':
+		case ']':
+		case '}':
+			return CHAR_CLASS_PARENS_CLOSE;
+
+		default:
+			return CHAR_CLASS_DEFAULT;
+	}
+}
+
+
+class Style : public BReferenceable {
+public:
+	Style(const BFont& font, float ascent, float descent, float width,
+			rgb_color fgColor, rgb_color bgColor, bool strikeOut,
+			rgb_color strikeOutColor, bool underline,
+			uint32 underlineStyle, rgb_color underlineColor)
+		:
+		font(font),
+
+		ascent(ascent),
+		descent(descent),
+		width(width),
+
+		fgColor(fgColor),
+		bgColor(bgColor),
+
+		strikeOut(strikeOut),
+		strikeOutColor(strikeOutColor),
+
+		underline(underline),
+		underlineStyle(underlineStyle),
+		underlineColor(underlineColor)
+	{
+	}
+
+public:
+	BFont					font;
+
+	// The following three values override glyph metrics unless -1
+	float					ascent;
+	float					descent;
+	float					width;
+
+	rgb_color				fgColor;
+	rgb_color				bgColor;
+
+	bool					strikeOut;
+	rgb_color				strikeOutColor;
+
+	bool					underline;
+	uint32					underlineStyle;
+	rgb_color				underlineColor;
+};
+
+
+typedef BReference<Style> StyleRef;
+
+
+class GlyphInfo {
+public:
+	GlyphInfo(uint32 charCode, float x, float y, float advanceX,
+			float maxAscend, float maxDescend, int lineIndex,
+			const StyleRef& style)
+		:
+		charCode(charCode),
+		x(x),
+		y(y),
+		advanceX(advanceX),
+		maxAscend(maxAscend),
+		maxDescend(maxDescend),
+		lineIndex(lineIndex),
+		style(style)
+	{
+	}
+	
+	GlyphInfo(const GlyphInfo& other)
+		:
+		charCode(other.charCode),
+		x(other.x),
+		y(other.y),
+		advanceX(other.advanceX),
+		maxAscend(other.maxAscend),
+		maxDescend(other.maxDescend),
+		lineIndex(other.lineIndex),
+		style(other.style)
+	{
+	}
+
+	GlyphInfo& operator=(const GlyphInfo& other)
+	{
+		charCode = other.charCode;
+		x = other.x;
+		y = other.y;
+		advanceX = other.advanceX;
+		maxAscend = other.maxAscend;
+		maxDescend = other.maxDescend;
+		lineIndex = other.lineIndex;
+		style = other.style;
+		return *this;
+	}
+
+	bool operator==(const GlyphInfo& other) const
+	{
+		return charCode == other.charCode
+			&& x == other.x
+			&& y == other.y
+			&& advanceX == other.advanceX
+			&& maxAscend == other.maxAscend
+			&& maxDescend == other.maxDescend
+			&& lineIndex == other.lineIndex
+			&& style == other.style;
+	}
+
+	bool operator!=(const GlyphInfo& other) const
+	{
+		return !(*this == other);
+	}
+
+public:
+	uint32					charCode;
+
+	float					x;
+	float					y;
+	float					advanceX;
+
+	float					maxAscend;
+	float					maxDescend;
+
+	int						lineIndex;
+
+	StyleRef				style;
+};
+
+
+class Line {
+public:
+	Line()
+		:
+		textOffset(0),
+		y(0.0f),
+		height(0.0f)
+	{
+	}
+	
+	Line(int textOffset, float y, float height)
+		:
+		textOffset(textOffset),
+		y(y),
+		height(height)
+	{
+	}
+	
+	Line(const Line& other)
+		:
+		textOffset(other.textOffset),
+		y(other.y),
+		height(other.height)
+	{
+	}
+
+	Line& operator=(const Line& other)
+	{
+		textOffset = other.textOffset;
+		y = other.y;
+		height = other.height;
+		return *this;
+	}
+
+	bool operator==(const Line& other) const
+	{
+		return textOffset == other.textOffset
+			&& y == other.y
+			&& height == other.height;
+	}
+
+	bool operator!=(const Line& other) const
+	{
+		return !(*this == other);
+	}
+
+public:
+	int		textOffset;
+	float	y;
+	float	height;
+	float	maxAscent;
+	float	maxDescent;
+};
+
+
+inline bool
+can_end_line(const GlyphInfo* buffer, int offset, int count)
+{
+	if (offset == count - 1)
+		return true;
+
+	if (offset < 0 || offset > count)
+		return false;
+
+	uint32 charCode = buffer[offset].charCode;
+	uint32 classification = get_char_classification(charCode);
+
+	// wrapping is always allowed at end of text and at newlines
+	if (classification == CHAR_CLASS_END_OF_TEXT || charCode == '\n')
+		return true;
+
+	uint32 nextCharCode = buffer[offset + 1].charCode;
+	uint32 nextClassification = get_char_classification(nextCharCode);
+
+	// never separate a punctuation char from its preceding word
+	if (classification == CHAR_CLASS_DEFAULT
+		&& nextClassification == CHAR_CLASS_PUNCTUATION) {
+		return false;
+	}
+
+	if ((classification == CHAR_CLASS_WHITESPACE
+			&& nextClassification != CHAR_CLASS_WHITESPACE)
+		|| (classification != CHAR_CLASS_WHITESPACE
+			&& nextClassification == CHAR_CLASS_WHITESPACE)) {
+		return true;
+	}
+
+	// allow wrapping after whitespace, unless more whitespace (except for
+	// newline) follows
+	if (classification == CHAR_CLASS_WHITESPACE
+		&& (nextClassification != CHAR_CLASS_WHITESPACE
+			|| nextCharCode == '\n')) {
+		return true;
+	}
+
+	// allow wrapping after punctuation chars, unless more punctuation, closing
+	// parenthesis or quotes follow
+	if (classification == CHAR_CLASS_PUNCTUATION
+		&& nextClassification != CHAR_CLASS_PUNCTUATION
+		&& nextClassification != CHAR_CLASS_PARENS_CLOSE
+		&& nextClassification != CHAR_CLASS_QUOTE) {
+		return true;
+	}
+
+	// allow wrapping after quotes, graphical chars and closing parenthesis only
+	// if whitespace follows (not perfect, but seems to do the right thing most
+	// of the time)
+	if ((classification == CHAR_CLASS_QUOTE
+			|| classification == CHAR_CLASS_GRAPHICAL
+			|| classification == CHAR_CLASS_PARENS_CLOSE)
+		&& nextClassification == CHAR_CLASS_WHITESPACE) {
+		return true;
+	}
+
+	return false;
+}
+
+
+class TextLayout::Layout {
+public:
+	Layout(TextLayout* textLayout)
+		:
+		fTextLayout(textLayout)
+	{
+	}
+
+	void ComputeLayout()
+	{
+		ComputeLayout(fTextLayout->fText, fTextLayout->fDefaultFont,
+			fTextLayout->fWidth);
+	}
+
+	void ComputeLayout(const BString& text, const BFont& font, float width)
+	{
+		fLines.Clear();
+		
+		int charCount = text.CountChars();
+		if (charCount == 0)
+			return;
+		
+		// Allocate arrays
+		float* escapementArray = new (std::nothrow) float[charCount];
+		if (escapementArray == NULL)
+			return;
+		ArrayDeleter<float> escapementDeleter(escapementArray);
+
+		uint32* charArray = new (std::nothrow) uint32[charCount];
+		if (charArray == NULL)
+			return;
+		ArrayDeleter<uint32> charDeleter(charArray);
+
+		// Fetch glyph spacing information
+		font.GetEscapements(text.String(), charCount, escapementArray);
+
+		// Convert to glyph buffer
+		const char* c = text.String();
+		for (int i = 0; i < charCount; i++) {
+			charArray[i] = UTF8ToCharCode(&c);
+		}
+
+//		float x = 0.0f;
+//		float y = 0.0f;
+		for (int i = 0; i < charCount; i++) {
+			// TODO: ...
+		}
+	}
+
+	float Height() const
+	{
+		float height = fTextLayout->fDefaultFont.Size();
+		if (fLines.CountItems() > 0) {
+			const Line& lastLine = fLines.LastItem();
+			height = lastLine.y + lastLine.height;
+		}
+		return height;
+	}
+
+	void Draw(BView* view, const BPoint& offset) const
+	{
+		// TODO: ...
+	}
+
+private:
+	TextLayout*			fTextLayout;
+	List<Line, false>	fLines;
+};
+
+
+// #pragma mark - TextLayout
+
+
+TextLayout::TextLayout()
+	:
+	fText(),
+
+	fDefaultFont(be_plain_font),
+	fWidth(0.0f),
+
+	fLayoutValid(false),
+	fLayout(new (std::nothrow) Layout(this))
+{
+}
+
+
+TextLayout::TextLayout(const TextLayout& other)
+	:
+	fText(other.fText),
+
+	fDefaultFont(other.fDefaultFont),
+	fWidth(other.fWidth),
+
+	fLayoutValid(false),
+	fLayout(new (std::nothrow) Layout(this))
+{
+}
+
+
+TextLayout::~TextLayout()
+{
+	delete fLayout;
+}
+
+
+void
+TextLayout::SetText(const BString& text)
+{
+	if (fText == text)
+		return;
+
+	fText = text;
+	fLayoutValid = false;
+}
+
+
+void
+TextLayout::SetFont(const BFont& font)
+{
+	if (fDefaultFont == font)
+		return;
+
+	fDefaultFont = font;
+	fLayoutValid = false;
+}
+
+
+void
+TextLayout::SetWidth(float width)
+{
+	if (fWidth == width)
+		return;
+
+	fWidth = width;
+	fLayoutValid = false;
+}
+
+
+float
+TextLayout::Height()
+{
+	if (_ValidateLayout())
+		return fLayout->Height();
+	return 0.0f;
+}
+
+
+void
+TextLayout::Draw(BView* view, const BPoint& offset)
+{
+	if (_ValidateLayout())
+		fLayout->Draw(view, offset);
+}
+
+
+// #pragma mark - private
+
+
+bool
+TextLayout::_ValidateLayout()
+{
+	if (!fLayoutValid && fLayout != NULL) {
+		fLayout->ComputeLayout();
+		return true;
+	}
+	return false;
+}
+
diff --git a/src/apps/haiku-depot/textview/TextLayout.h b/src/apps/haiku-depot/textview/TextLayout.h
new file mode 100644
index 0000000000..8477d49660
--- /dev/null
+++ b/src/apps/haiku-depot/textview/TextLayout.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2013, Stephan Aßmus <superstippi@gmx.de>.
+ * All rights reserved. Distributed under the terms of the MIT License.
+ */
+#ifndef TEXT_LAYOUT_H
+#define TEXT_LAYOUT_H
+
+#include <Font.h>
+#include <Referenceable.h>
+#include <String.h>
+
+
+class BView;
+
+
+class TextLayout : public BReferenceable {
+public:
+								TextLayout();
+								TextLayout(const TextLayout& other);
+	virtual						~TextLayout();
+
+			void				SetText(const BString& text);
+			const BString&		Text() const
+									{ return fText; }
+
+			void				SetFont(const BFont& font);
+			const BFont&		Font() const
+									{ return fDefaultFont; }
+
+			void				SetWidth(float width);
+			float				Width() const
+									{ return fWidth; }
+
+			float				Height();
+			void				Draw(BView* view, const BPoint& offset);
+
+private:
+			bool				_ValidateLayout();
+
+private:
+			class Layout;
+			friend class Layout;
+
+			BString				fText;
+
+			BFont				fDefaultFont;
+			float				fWidth;
+			
+			bool				fLayoutValid;
+			Layout*				fLayout;
+};
+
+#endif // FILTER_VIEW_H
diff --git a/src/apps/haiku-depot/textview/TextView.cpp b/src/apps/haiku-depot/textview/TextView.cpp
new file mode 100644
index 0000000000..65c9ecec80
--- /dev/null
+++ b/src/apps/haiku-depot/textview/TextView.cpp
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2013, Stephan Aßmus <superstippi@gmx.de>.
+ * All rights reserved. Distributed under the terms of the MIT License.
+ */
+
+#include "TextView.h"
+
+
+TextView::TextView(const char* name)
+	:
+	BView(name, B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE)
+{
+}
+
+
+TextView::~TextView()
+{
+}
+
+
+void
+TextView::Draw(BRect updateRect)
+{
+	FillRect(updateRect, B_SOLID_LOW);
+	fTextLayout.Draw(this, B_ORIGIN);
+}
+
+
+void
+TextView::FrameResized(float width, float height)
+{
+	fTextLayout.SetWidth(width);
+}
+
+
+BSize
+TextView::MinSize()
+{
+	return BSize(fTextLayout.Width(), fTextLayout.Height());
+}
+
+
+BSize
+TextView::MaxSize()
+{
+	return MinSize();
+}
+
+
+BSize
+TextView::PreferredSize()
+{
+	return MinSize();
+}
+
+
+bool
+TextView::HasHeightForWidth()
+{
+	return true;
+}
+
+
+void
+TextView::GetHeightForWidth(float width, float* min,
+	float* max, float* preferred)
+{
+	TextLayout layout(fTextLayout);
+	layout.SetWidth(width);
+
+	float height = layout.Height();
+
+	if (min != NULL)
+		*min = height;
+	if (max != NULL)
+		*max = height;
+	if (preferred != NULL)
+		*preferred = height;
+}
+
+
+void
+TextView::SetText(const BString& text)
+{
+	fTextLayout.SetText(text);
+}
+
diff --git a/src/apps/haiku-depot/textview/TextView.h b/src/apps/haiku-depot/textview/TextView.h
new file mode 100644
index 0000000000..51626dfc50
--- /dev/null
+++ b/src/apps/haiku-depot/textview/TextView.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2013, Stephan Aßmus <superstippi@gmx.de>.
+ * All rights reserved. Distributed under the terms of the MIT License.
+ */
+#ifndef TEXT_VIEW_H
+#define TEXT_VIEW_H
+
+#include <String.h>
+#include <View.h>
+
+#include "TextLayout.h"
+
+
+class TextView : public BView {
+public:
+								TextView(const char* name = NULL);
+	virtual						~TextView();
+
+	virtual void				Draw(BRect updateRect);
+
+	virtual void				FrameResized(float width, float height);
+
+	virtual	BSize				MinSize();
+	virtual	BSize				MaxSize();
+	virtual	BSize				PreferredSize();
+
+	virtual	bool				HasHeightForWidth();
+	virtual	void				GetHeightForWidth(float width, float* min,
+									float* max, float* preferred);
+
+			void				SetText(const BString& text);
+
+private:
+			TextLayout			fTextLayout;
+};
+
+#endif // FILTER_VIEW_H