diff --git a/source/gui/CText.cpp b/source/gui/CText.cpp
index 3a53ebcab2..a3bcef2e84 100755
--- a/source/gui/CText.cpp
+++ b/source/gui/CText.cpp
@@ -20,6 +20,7 @@ using namespace std;
 //-------------------------------------------------------------------
 CText::CText()
 {
+	AddSetting(GUIST_int,			"buffer-zone");
 	AddSetting(GUIST_CGUIString,	"caption");
 	AddSetting(GUIST_CStr,			"font");
 	AddSetting(GUIST_bool,			"scrollbar");
@@ -73,7 +74,10 @@ void CText::SetupText()
 	if (scrollbar && GetScrollBar(0).GetStyle())
 		width -= GetScrollBar(0).GetStyle()->m_Width;
 
-	*m_GeneratedTexts[0] = GetGUI()->GenerateText(caption, font, width, 4, this);
+
+    int buffer_zone=0;
+	GUI<int>::GetSetting(this, "buffer-zone", buffer_zone);
+	*m_GeneratedTexts[0] = GetGUI()->GenerateText(caption, font, width, buffer_zone, this);
 
 	// Setup scrollbar
 	if (scrollbar)
diff --git a/source/gui/GUItext.cpp b/source/gui/GUItext.cpp
index 7befad3f42..61649ae066 100755
--- a/source/gui/GUItext.cpp
+++ b/source/gui/GUItext.cpp
@@ -533,7 +533,7 @@ void CGUIString::SetValue(const CStr& str)
 		}
 	}
 
-#if 1
+#if 0
 	for (int i=0; i<(int)m_Words.size(); ++i)
 	{
 		LOG(NORMAL, LOG_CATEGORY, "m_Words[%d] = %d", i, m_Words[i]);