         {
             var textLine:TextLine = TextLine(getChildAt(i));
             
-            // Adjust text width to include indents and margins so that
-            // autoSize will be correct.
-            var width:Number = textLine.x + textLine.textWidth;
-            if (autoSize == TextFieldAutoSize.NONE || !wordWrap) 
-                 width += rightMargin;
+            var width:Number = textLine.x + textLine.textWidth + rightMargin;
             
             // Only align if there is width to do so.
-            if (leftAligned || width > alignWidth)
+            if (leftAligned || width > innerWidth)
                 textLine.x += leftOffset;
             else if (centerAligned)
                 textLine.x += centerOffset - width / 2;
             else if (rightAligned)
                 textLine.x += rightOffset - width;
-            
+                                    
+            // Text width should include indents and margins so that
+            // autoSize will be correct.  A negative rightMargin increases
+            // the width for the purposes of alignment only.  
+            // The text still needs to be clipped based on its actual width.
+            width = rightMargin > 0 ?
+                    textLine.x + textLine.textWidth + rightMargin :
+                    textLine.x + textLine.textWidth;
+                        
             _textWidth = Math.max(_textWidth, width);
             
             textLine.y += PADDING_TOP;

				{
					nextTextLine = fontContext.callInContext(
						textBlock.createTextLine, textBlock,
						[ textLine, maxLineWidth ]);
				}
				else
				{
					nextTextLine = textBlock.createTextLine(
						textLine, maxLineWidth);
				}
			}
			

	 */
	private function alignTextLines(innerWidth:Number):void
	{
        // This is only the case when we are auto sizing.  In this case
        // we don't want to do any alignment.
        if (isNaN(innerWidth))
            innerWidth = 0;
    
        var rightMargin:Number = Number(_defaultTextFormat.rightMargin);        

