Index: binaries/data/mods/public/gui/common/styles.xml
===================================================================
--- binaries/data/mods/public/gui/common/styles.xml
+++ binaries/data/mods/public/gui/common/styles.xml
@@ -123,7 +123,7 @@
 	/>
 
 	<style name="ChatPanel"
-		buffer_zone="5"
+		buffer_zone="3"
 		font="sans-13"
 		scrollbar="true"
 		scrollbar_style="ModernScrollBar"
@@ -132,6 +132,7 @@
 		textcolor_selected="gold"
 		text_align="left"
 		text_valign="center"
+		sprite_selectarea="color: 255 255 255 10"
 	/>
 
 	<style name="TutorialPanel"
Index: binaries/data/mods/public/gui/gamesetup/gamesetup.js
===================================================================
--- binaries/data/mods/public/gui/gamesetup/gamesetup.js
+++ binaries/data/mods/public/gui/gamesetup/gamesetup.js
@@ -2595,7 +2595,7 @@
 
 	g_ChatMessages.push(text);
 
-	Engine.GetGUIObjectByName("chatText").caption = g_ChatMessages.join("\n");
+	Engine.GetGUIObjectByName("chatText").addItem(text);
 }
 
 function resetCivilizations()
Index: binaries/data/mods/public/gui/gamesetup/gamesetup.xml
===================================================================
--- binaries/data/mods/public/gui/gamesetup/gamesetup.xml
+++ binaries/data/mods/public/gui/gamesetup/gamesetup.xml
@@ -209,7 +209,7 @@
 
 			<!-- Chat window -->
 			<object name="chatPanel" size="24 346 100%-640 100%-60" type="image" sprite="ModernDarkBoxGold">
-				<object name="chatText" size="2 2 100%-2 100%-28" type="text" style="ChatPanel"/>
+				<object name="chatText" size="2 2 100%-2 100%-28" type="list" style="ChatPanel"/>
 
 				<object name="chatInput" size="4 100%-26 100%-96 100%-4" type="input" style="ModernInput">
 					<action on="Press">submitChatInput();</action>
Index: binaries/data/mods/public/gui/lobby/lobby.js
===================================================================
--- binaries/data/mods/public/gui/lobby/lobby.js
+++ binaries/data/mods/public/gui/lobby/lobby.js
@@ -1405,7 +1405,7 @@
 		return;
 
 	g_ChatMessages.push(formatted);
-	Engine.GetGUIObjectByName("chatText").caption = g_ChatMessages.join("\n");
+	Engine.GetGUIObjectByName("chatText").addItem(formatted);
 }
 
 /**
Index: binaries/data/mods/public/gui/lobby/lobby_panels.xml
===================================================================
--- binaries/data/mods/public/gui/lobby/lobby_panels.xml
+++ binaries/data/mods/public/gui/lobby/lobby_panels.xml
@@ -256,7 +256,7 @@
 		</object>
 
 		<object name="chatPanel" size="0 49% 100% 100%" type="image" sprite="ModernDarkBoxGold">
-			<object name="chatText" size="0 0 100% 100%-28" type="text" style="ChatPanel" font="sans-13"/>
+			<object name="chatText" size="0 0 100% 100%-28" type="list" style="ChatPanel" font="sans-13"/>
 			<object name="chatInput" size="0 100%-26 100%-72 100%-4" type="input" style="ModernInput" font="sans-13">
 				<action on="Press">submitChatInput();</action>
 				<action on="Tab">
Index: source/gui/CList.h
===================================================================
--- source/gui/CList.h
+++ source/gui/CList.h
@@ -43,9 +43,9 @@
 	virtual void ResetStates() { IGUIScrollBarOwner::ResetStates(); }
 
 	/**
-	 * Adds an item last to the list.
+	 * @see IGUIObject#AddItem()
 	 */
-	virtual void AddItem(const CStrW& str, const CStrW& data);
+	void AddItem(const CGUIString& str, const CGUIString& data) override;
 
 protected:
 	/**
@@ -55,6 +55,11 @@
 	virtual void SetupText();
 
 	/**
+	* Sets up the last text entry, should be called every time AddItem is called.
+	*/
+	virtual void SetupTextLastItem();
+
+	/**
 	 * @see IGUIObject#HandleMessage()
 	 */
 	virtual void HandleMessage(SGUIMessage& Message);
Index: source/gui/CList.cpp
===================================================================
--- source/gui/CList.cpp
+++ source/gui/CList.cpp
@@ -146,6 +146,72 @@
 	}
 }
 
+void CList::SetupTextLastItem()
+{
+	if (!GetGUI())
+		return;
+
+	m_Modified = true;
+	CGUIList* pList;
+	GUI<CGUIList>::GetSettingPointer(this, "list", pList);
+
+	m_ItemsYPositions.resize(pList->m_Items.size() + 1);
+
+	CStrW font;
+	if (GUI<CStrW>::GetSetting(this, "font", font) != PSRETURN_OK || font.empty())
+		// Use the default if none is specified
+		// TODO Gee: (2004-08-14) Don't define standard like this. Do it with the default style.
+		font = L"default";
+
+	bool scrollbar;
+	GUI<bool>::GetSetting(this, "scrollbar", scrollbar);
+
+	float width = GetListRect().GetWidth();
+	// remove scrollbar if applicable
+	if (scrollbar && GetScrollBar(0).GetStyle())
+		width -= GetScrollBar(0).GetStyle()->m_Width;
+
+	float buffer_zone = 0.f;
+	GUI<float>::GetSetting(this, "buffer_zone", buffer_zone);
+
+	size_t itemsSize = pList->m_Items.size();
+	if (itemsSize == 0)
+		return;
+
+	size_t i = itemsSize - 1;
+	
+	// Create a new SGUIText. Later on, input it using AddText()
+	SGUIText* text = new SGUIText();
+
+	if (!pList->m_Items[i].GetOriginalString().empty())
+		*text = GetGUI()->GenerateText(pList->m_Items[i], font, width, buffer_zone, this);
+	else
+	{
+		// Minimum height of a space character of the current font size
+		CGUIString align_string;
+		align_string.SetValue(L" ");
+		*text = GetGUI()->GenerateText(align_string, font, width, buffer_zone, this);
+	}
+
+	float buffered_y = i == 0 ? 0.f : m_ItemsYPositions[i];
+	m_ItemsYPositions[i] = buffered_y;
+	AddText(text);
+	m_ItemsYPositions[i+1] = buffered_y + text->m_Size.cy;
+	
+	// Setup scrollbar
+	if (!scrollbar)
+		return;
+
+	GetScrollBar(0).SetScrollRange(m_ItemsYPositions.back());
+	GetScrollBar(0).SetScrollSpace(GetListRect().GetHeight());
+
+	CRect rect = GetListRect();
+	GetScrollBar(0).SetX(rect.right);
+	GetScrollBar(0).SetY(rect.top);
+	GetScrollBar(0).SetZ(GetBufferedZ());
+	GetScrollBar(0).SetLength(rect.bottom - rect.top);
+}
+
 void CList::HandleMessage(SGUIMessage& Message)
 {
 	IGUIScrollBarOwner::HandleMessage(Message);
@@ -412,7 +478,7 @@
 	}
 }
 
-void CList::AddItem(const CStrW& str, const CStrW& data)
+void CList::AddItem(const CGUIString& str, const CGUIString& data)
 {
 	CGUIList* pList;
 	CGUIList* pListData;
@@ -419,16 +485,10 @@
 	GUI<CGUIList>::GetSettingPointer(this, "list", pList);
 	GUI<CGUIList>::GetSettingPointer(this, "list_data", pListData);
 
-	CGUIString gui_string;
-	gui_string.SetValue(str);
-	pList->m_Items.push_back(gui_string);
+	pList->m_Items.push_back(str);
+	pListData->m_Items.push_back(data);
 
-	CGUIString data_string;
-	data_string.SetValue(data);
-	pListData->m_Items.push_back(data_string);
-
-	// TODO Temp
-	SetupText();
+	SetupTextLastItem();
 }
 
 bool CList::HandleAdditionalChildren(const XMBElement& child, CXeromyces* pFile)
@@ -437,7 +497,9 @@
 
 	if (child.GetNodeName() == elmt_item)
 	{
-		AddItem(child.GetText().FromUTF8(), child.GetText().FromUTF8());
+		CGUIString vlist;
+		vlist.SetValue(child.GetText().FromUTF8());
+		AddItem(vlist, vlist);
 		return true;
 	}
 
Index: source/gui/COList.cpp
===================================================================
--- source/gui/COList.cpp
+++ source/gui/COList.cpp
@@ -216,7 +216,9 @@
 
 	if (child.GetNodeName() == elmt_item)
 	{
-		AddItem(child.GetText().FromUTF8(), child.GetText().FromUTF8());
+		CGUIString vlist;
+		vlist.SetValue(child.GetText().FromUTF8());
+		AddItem(vlist, vlist);
 		return true;
 	}
 	else if (child.GetNodeName() == elmt_column)
Index: source/gui/IGUIObject.h
===================================================================
--- source/gui/IGUIObject.h
+++ source/gui/IGUIObject.h
@@ -25,6 +25,8 @@
 #ifndef INCLUDED_IGUIOBJECT
 #define INCLUDED_IGUIOBJECT
 
+#include "ps/CLogger.h"
+
 #include "GUIbase.h"
 #include "GUItext.h"
 
@@ -87,6 +89,7 @@
 	friend bool JSI_IGUIObject::getProperty(JSContext* cx, JS::HandleObject obj, JS::HandleId id, JS::MutableHandleValue vp);
 	friend bool JSI_IGUIObject::setProperty(JSContext* cx, JS::HandleObject obj, JS::HandleId id, bool UNUSED(strict), JS::MutableHandleValue vp);
 	friend bool JSI_IGUIObject::getComputedSize(JSContext* cx, uint argc, JS::Value* vp);
+	friend bool JSI_IGUIObject::addItem(JSContext* cx, uint argc, JS::Value* vp);
 
 public:
 	IGUIObject();
@@ -127,6 +130,11 @@
 	CStr GetPresentableName() const;
 
 	/**
+	* Adds an item last to the list.
+	*/
+	virtual void AddItem(const CGUIString& str, const CGUIString& data){ LOGWARNING("Inavlid type for addItem method."); }
+
+	/**
 	 * Adds object and its children to the map, it's name being the
 	 * first part, and the second being itself.
 	 *
Index: source/gui/scripting/JSInterface_IGUIObject.h
===================================================================
--- source/gui/scripting/JSInterface_IGUIObject.h
+++ source/gui/scripting/JSInterface_IGUIObject.h
@@ -30,6 +30,7 @@
 	bool toString(JSContext* cx, uint argc, JS::Value* vp);
 	bool focus(JSContext* cx, uint argc, JS::Value* vp);
 	bool blur(JSContext* cx, uint argc, JS::Value* vp);
+	bool addItem(JSContext* cx, uint argc, JS::Value* vp);
 	bool getComputedSize(JSContext* cx, uint argc, JS::Value* vp);
 	void init(ScriptInterface& scriptInterface);
 }
Index: source/gui/scripting/JSInterface_IGUIObject.cpp
===================================================================
--- source/gui/scripting/JSInterface_IGUIObject.cpp
+++ source/gui/scripting/JSInterface_IGUIObject.cpp
@@ -45,6 +45,7 @@
 	JS_FN("focus", JSI_IGUIObject::focus, 0, 0),
 	JS_FN("blur", JSI_IGUIObject::blur, 0, 0),
 	JS_FN("getComputedSize", JSI_IGUIObject::getComputedSize, 0, 0),
+	JS_FN("addItem", JSI_IGUIObject::addItem, 0, 0),
 	JS_FS_END
 };
 
@@ -76,6 +77,7 @@
 		propName == "toJSON"      ||
 		propName == "focus"       ||
 		propName == "blur"        ||
+		propName == "addItem"     ||
 		propName == "getComputedSize"
 	   )
 		return true;
@@ -717,3 +719,37 @@
 	rec.rval().set(objVal);
 	return true;
 }
+
+bool JSI_IGUIObject::addItem(JSContext* cx, uint argc, JS::Value* vp)
+{
+	JSAutoRequest rq(cx);
+	JS::CallReceiver rec = JS::CallReceiverFromVp(vp);
+
+	JS::RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
+
+	IGUIObject* e = (IGUIObject*)JS_GetInstancePrivate(cx, obj, &JSI_IGUIObject::JSI_class, NULL);
+	if (!e)
+		return false;
+
+	JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
+
+	if (args.length() == 2 && args[0].isString() && args[1].isString())
+	{
+		CGUIString vlist;
+		CGUIString vdata;
+		ScriptInterface::FromJSVal(cx, args[0], vlist);
+		ScriptInterface::FromJSVal(cx, args[1], vdata);
+		e->AddItem(vlist, vdata);
+	}
+	else if (args.length() == 1 && args[0].isString())
+	{
+		CGUIString vlist;
+		ScriptInterface::FromJSVal(cx, args[0], vlist);
+		e->AddItem(vlist, vlist);
+	}
+	else
+		return false;
+
+	rec.rval().setUndefined();
+	return true;
+}
\ No newline at end of file