diff --git a/WINGs/WINGs.h b/WINGs/WINGs.h
index 0aadbe87..afba425b 100644
--- a/WINGs/WINGs.h
+++ b/WINGs/WINGs.h
@@ -1562,6 +1562,9 @@ void WMSetTextAlignment(WMText *tPtr, WMAlignment alignment);
 Bool WMFindInTextStream(WMText *tPtr, char *needle, Bool direction,
     Bool caseSensitive);
 
+Bool WMReplaceTextSelection(WMText *tPtr, char *replacement);
+
+
 /* parser related stuff... use only if implementing a new parser */
 
 void *WMCreateTextBlockWithObject(WMText *tPtr, WMWidget *w, char *description,
diff --git a/WINGs/wtext.c b/WINGs/wtext.c
index defbb27a..39e111dc 100644
--- a/WINGs/wtext.c
+++ b/WINGs/wtext.c
@@ -84,10 +84,7 @@ typedef struct _TextBlock {
 
 /* I'm lazy: visible.h vs. visible.size.height :-) */
 typedef struct {
-    unsigned int y;
-    unsigned int x;
-    unsigned int h;
-    unsigned int w;
+    int y, x, h, w;
 } myRect;
 
 
@@ -1554,6 +1551,8 @@ layOutDocument(Text *tPtr)
     if ( tPtr->flags.frozen || (!(tb = tPtr->firstTextBlock)) )
         return;
 
+    assert(tPtr->visible.w > 20);
+    
     tPtr->docWidth = tPtr->visible.w;
     x = tPtr->margins[tb->marginN].first; 
     bmargin = tPtr->margins[tb->marginN].body;
@@ -1671,16 +1670,16 @@ _layOut:
                     width = WMWidthOfString(font, 
                         &tb->text[begin], end-begin);
 
-                    /* if it won't fit,  break it up */
-                    if (width > tPtr->visible.w) { 
+                    /* if it won't fit, char wrap it */
+                    if (width >= tPtr->visible.w) { 
                         char *t = &tb->text[begin];
                         int l=end-begin, i=0;
                         do { 
                             width = WMWidthOfString(font, t, ++i);
                         } while (width < tPtr->visible.w && i < l);  
+                        if(i>2) i--;
                         end = begin+i;
-                        if (start) 
-                             start -= l-i;    
+                        start = &tb->text[end];
                     }
 
                     lw += width;
@@ -1856,6 +1855,7 @@ clearText(Text *tPtr)
 {
     tPtr->vpos = tPtr->hpos = 0;
     tPtr->docHeight = tPtr->docWidth = 0;
+    tPtr->cursor.x = -23;
 
     if (!tPtr->firstTextBlock) 
         return;
@@ -3996,3 +3996,25 @@ WMFindInTextStream(WMText *tPtr, char *needle, Bool direction,
 }
 
 
+Bool
+WMReplaceTextSelection(WMText *tPtr, char *replacement) 
+{
+    if (!tPtr)
+        return False;
+
+    if (!tPtr->flags.ownsSelection)
+        return False;
+
+    removeSelection(tPtr);
+
+    if(replacement) {
+        insertTextInteractively(tPtr, replacement, strlen(replacement));
+        updateCursorPosition(tPtr);
+        paintText(tPtr);
+    }
+
+    return True;
+
+}
+
+