diff --git a/docs/notework.txt b/docs/notework.txt
index 6cc7147..5b11321 100644
--- a/docs/notework.txt
+++ b/docs/notework.txt
@@ -12,6 +12,9 @@ ______________________________________________________________________
                Notes for GoldED+ 1.1.5, /snapshot/
 ______________________________________________________________________
 
+- Fixed quotewrap in internal editor if quotestring contains a space
+  inside.
+
 ! GoldED+ will no longer add new entry to addressbook if it is an
   addressmacro.
 
diff --git a/golded3/geedit.cpp b/golded3/geedit.cpp
index 532781e..c1411dd 100644
--- a/golded3/geedit.cpp
+++ b/golded3/geedit.cpp
@@ -682,7 +682,7 @@ Line* IEclass::wrapit(Line** __currline, uint* __curr_col, uint* __curr_row, boo
         int _atmargin = _wrappos;
 
         // Search backwards until a space or the beginning of the line is found 
-        while((_wrappos > 0) and (_thisline->txt[_wrappos-1] != ' '))
+        while((_wrappos > _quotelen) and (_thisline->txt[_wrappos-1] != ' '))
           _wrappos--;
 
         // Check if we hit leading spaces
@@ -694,7 +694,7 @@ Line* IEclass::wrapit(Line** __currline, uint* __curr_col, uint* __curr_row, boo
         }
 
         // Did we search all the way back to the beginning of the line?
-        if((_wrappos == 0) or (_wrappos == _quotelen) or (_thisline->txt[_spacepos] == ' ')) {
+        if((_wrappos == _quotelen) or (_thisline->txt[_spacepos] == ' ')) {
 
           // Case 3: There are no spaces within the margin or we hit leading spaces