diff --git a/ChangeLog b/ChangeLog
index 2317a8172..afffdf5aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-19 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/GSHorizontalTypesetter.m (-_cacheMoveTo:): Use default
+	paragraph style when none is set.
+
 2009-09-19 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Headers/Additions/GNUstepGUI/GSTextConverter.h,
diff --git a/Source/GSHorizontalTypesetter.m b/Source/GSHorizontalTypesetter.m
index f1a5dd40c..f2f9c0787 100644
--- a/Source/GSHorizontalTypesetter.m
+++ b/Source/GSHorizontalTypesetter.m
@@ -188,6 +188,10 @@ the last time or not, we wouldn't need to clear the cache every time */
 					atIndex: i
 					longestEffectiveRange: &paragraphRange
 					inRange: paragraphRange];
+      if (curParagraphStyle == nil)
+        {
+          curParagraphStyle = [NSParagraphStyle defaultParagraphStyle];
+        }
 
       curFont = [curLayoutManager effectiveFontForGlyphAtIndex: glyph
 				range: &fontRange];