diff --git a/ChangeLog b/ChangeLog
index e79edde42..6dbf9b419 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-14  Eric Wasylishen  <ewasylishen@gmail.com>
+
+	* Source/NSLayoutManager.m: Don't draw spelling underlines
+	when printing
+
 2011-03-14  Eric Wasylishen  <ewasylishen@gmail.com>
 
 	* Source/NSTextView.m: Attempt to add pagination support
diff --git a/Source/NSLayoutManager.m b/Source/NSLayoutManager.m
index 4d9262f8f..40ddab7a3 100644
--- a/Source/NSLayoutManager.m
+++ b/Source/NSLayoutManager.m
@@ -1731,38 +1731,41 @@ for (i = 0; i < gbuf_len; i++) printf("   %3i : %04x\n", i, gbuf[i]); */
       }
   
     // Draw spelling state (i.e. red underline for misspelled words)
-  
-    for (i=characterRange.location; i<NSMaxRange(characterRange); )
-      {
-	NSRange underlinedCharacterRange;
-	id underlineValue = [self temporaryAttribute: NSSpellingStateAttributeName
-				    atCharacterIndex: i
-			       longestEffectiveRange: &underlinedCharacterRange
-					     inRange: characterRange];
-	if (underlineValue != nil && [underlineValue integerValue] != 0)
-	  {
-	    const NSRange underlinedGylphRange = [self glyphRangeForCharacterRange: underlinedCharacterRange
-							      actualCharacterRange: NULL];
-	  
-	    // we have a range of glpyhs that need underlining, which might span
-	    // multiple line fragments, so we need to iterate though the line fragments
-	    for (j=underlinedGylphRange.location; j<NSMaxRange(underlinedGylphRange); )
-	      {
-		NSRange lineFragmentGlyphRange;
-		const NSRect lineFragmentRect = [self lineFragmentRectForGlyphAtIndex: j
-								       effectiveRange: &lineFragmentGlyphRange];
-		const NSRange rangeToUnderline = NSIntersectionRange(underlinedGylphRange, lineFragmentGlyphRange);
 
-		[self _drawSpellingState: [underlineValue integerValue]
-			   forGylphRange: rangeToUnderline
-			lineFragmentRect: lineFragmentRect
-		  lineFragmentGlyphRange: lineFragmentGlyphRange
-			 containerOrigin: containerOrigin];
+    if ([NSGraphicsContext currentContextDrawingToScreen])
+      {
+	for (i=characterRange.location; i<NSMaxRange(characterRange); )
+	  {
+	    NSRange underlinedCharacterRange;
+	    id underlineValue = [self temporaryAttribute: NSSpellingStateAttributeName
+					atCharacterIndex: i
+				   longestEffectiveRange: &underlinedCharacterRange
+						 inRange: characterRange];
+	    if (underlineValue != nil && [underlineValue integerValue] != 0)
+	      {
+		const NSRange underlinedGylphRange = [self glyphRangeForCharacterRange: underlinedCharacterRange
+								  actualCharacterRange: NULL];
 		
-		j = NSMaxRange(rangeToUnderline);
+		// we have a range of glpyhs that need underlining, which might span
+		// multiple line fragments, so we need to iterate though the line fragments
+		for (j=underlinedGylphRange.location; j<NSMaxRange(underlinedGylphRange); )
+		  {
+		    NSRange lineFragmentGlyphRange;
+		    const NSRect lineFragmentRect = [self lineFragmentRectForGlyphAtIndex: j
+									   effectiveRange: &lineFragmentGlyphRange];
+		    const NSRange rangeToUnderline = NSIntersectionRange(underlinedGylphRange, lineFragmentGlyphRange);
+		    
+		    [self _drawSpellingState: [underlineValue integerValue]
+			       forGylphRange: rangeToUnderline
+			    lineFragmentRect: lineFragmentRect
+		      lineFragmentGlyphRange: lineFragmentGlyphRange
+			     containerOrigin: containerOrigin];
+		    
+		    j = NSMaxRange(rangeToUnderline);
+		  }
 	      }
+	    i += underlinedCharacterRange.length;
 	  }
-	i += underlinedCharacterRange.length;
       }
   }
 }