                     totalIndent = 0;                
                else if (totalIndent > _width - PADDING_LEFT - PADDING_RIGHT)                
                     totalIndent = _width - PADDING_LEFT - PADDING_RIGHT;
+
+                maxLineWidth = 
+                    maxLineWidthBeforeIndent - totalIndent;
                 
-                if (!wordWrap)
-                    rightMargin = 0;
-                
-                maxLineWidth = 
-                    maxLineWidthBeforeIndent - totalIndent - rightMargin;
+                if (wordWrap)
+                    maxLineWidthBeforeIndent -= rightMargin;
 
                 // Stay within the bounds to avoid exception.  Since 
                 // fitSomething is true it is okay if maxLineWidth is < 0.

        if (isNaN(innerWidth))
            innerWidth = 0;
    
        var rightMargin:Number = Number(_defaultTextFormat.rightMargin);        

		var align:String = _defaultTextFormat.align;
		var leftAligned:Boolean = 
			align == "left" ||

                    
                    var blockIndent:Number = Number(_defaultTextFormat.blockIndent);
                    var indent:Number = Number(_defaultTextFormat.indent);

                    // Factor in indents and margins if the combined total
                    // is positive.
                    if (blockIndent + indent + leftMargin > 0)
