                     // The composeWidth may be adjusted for minWidth/maxWidth.
                     bounds = measureTextSize(NaN, composeHeight);
                     
+                    measuredWidth = Math.ceil(bounds.right);               
+                    measuredHeight = composeHeight;
+
                     // Have we already hit the limit with the existing text?  If we
                     // are beyond the composeHeight we can assume we've maxed out on
-                    // the compose width as well.
+                    // the compose width as well (or the composeHeight isn't
+                    // large enough for even one line of text).
                     if (bounds.bottom > composeHeight)
-                    {
-                        measuredWidth = _textContainerManager.compositionWidth;
-                        measuredHeight = composeHeight;
                         autoSize = false;
-                    }
-                    else
-                    {
-                        measuredWidth = Math.ceil(bounds.right);               
-                        measuredHeight = composeHeight;
-                    }
                 }
                 else
                 {

                // No reflow for explicit lineBreak
                if (_textContainerManager.hostFormat.lineBreak == "explicit")
                    return false;
                
                widthConstraint = width;
            } 
            
            if (height != measuredHeight)
            {        
                // Do we have a constrained height and an explicit width?
                // If so, the sizes are set so no need to remeasure now.

                
                // Is there no height?
                if (height == 0)
                    return false;                
            }                       
            
            // Width or height is different than what was measured.  Since we're
