diff --git a/ChangeLog b/ChangeLog
index 16007230f..c1dda1a70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-21 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/NSAttributedString.m (-fixFontAttributeInRange:): Ignore
+	characters below 31. 
+	Patch by Yen-Ju Chen <yjchenx@gmail.com>
+
 2007-08-20 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/NSWindow.m (-sendEvent:): For the left mouse down case
diff --git a/Source/NSAttributedString.m b/Source/NSAttributedString.m
index 9771a358c..6be51037b 100644
--- a/Source/NSAttributedString.m
+++ b/Source/NSAttributedString.m
@@ -1123,7 +1123,8 @@ static NSMutableDictionary *cachedCSets = nil;
           charset = [font coveredCharacterSet];
         }
       
-      if (charset != nil && ![charset characterIsMember: uchar])
+      if (charset != nil && ![charset characterIsMember: uchar]
+          && (uchar > 31))
         {
           // Find a replacement font
           NSFont *subFont;