diff --git a/Source/NSAttributedString.m b/Source/NSAttributedString.m
index 9e9226b21..d42db04f2 100644
--- a/Source/NSAttributedString.m
+++ b/Source/NSAttributedString.m
@@ -1559,6 +1559,7 @@ static NSMutableDictionary *cachedCSets = nil;
   NSUInteger start;
   unichar chars[64];
   CREATE_AUTORELEASE_POOL(pool);
+  NSCharacterSet *controlset = [NSCharacterSet controlCharacterSet];
   
   if (NSMaxRange (range) > [self length])
     {
@@ -1610,7 +1611,8 @@ static NSMutableDictionary *cachedCSets = nil;
         }
       
       if (charset != nil && ![charset characterIsMember: uchar]
-          && (uchar > 31))
+          && (uchar != NSAttachmentCharacter)
+          && ![controlset characterIsMember: uchar])
         {
           // Find a replacement font
           NSFont *subFont;