Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Chat/ChatMessagesPanel.js
===================================================================
--- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Chat/ChatMessagesPanel.js
+++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Chat/ChatMessagesPanel.js
@@ -32,7 +32,7 @@
 			text = this.timestampWrapper.format(text);
 
 		this.chatHistory += this.chatHistory ? "\n" + text : text;
-		this.chatText.caption = this.chatHistory;
+		this.chatText.pushItem(text, text);
 	}
 
 	addStatusMessage(text)
Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Chat/ChatPanel.xml
===================================================================
--- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Chat/ChatPanel.xml
+++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Chat/ChatPanel.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <object name="chatPanel" type="image" sprite="ModernDarkBoxGold">
 
-	<object name="chatText" type="text" size="2 2 100%-2 100%-28" style="ChatPanel"/>
+	<object name="chatText" type="list" size="2 2 100%-2 100%-28" style="ChatPanel"/>
 
 	<object name="chatInput" type="input" size="4 100%-26 100%-96 100%-4" style="ModernInput"/>
 
Index: binaries/data/mods/public/gui/lobby/LobbyPage/Chat/ChatMessagesPanel.js
===================================================================
--- binaries/data/mods/public/gui/lobby/LobbyPage/Chat/ChatMessagesPanel.js
+++ binaries/data/mods/public/gui/lobby/LobbyPage/Chat/ChatMessagesPanel.js
@@ -24,6 +24,7 @@
 			text = this.timestampWrapper.format(timestamp, text);
 
 		this.chatHistory += this.chatHistory ? "\n" + text : text;
+		this.chatText.pushItem(text);
 
 		if (!this.hasUpdate)
 		{
@@ -38,7 +39,6 @@
 	{
 		if (this.hasUpdate)
 		{
-			this.chatText.caption = this.chatHistory;
 			this.hasUpdate = false;
 			this.xmppMessages.unregisterMessageBatchProcessedHandler(this.flushEvent);
 		}
Index: binaries/data/mods/public/gui/lobby/LobbyPage/Chat/ChatPanel.xml
===================================================================
--- binaries/data/mods/public/gui/lobby/LobbyPage/Chat/ChatPanel.xml
+++ binaries/data/mods/public/gui/lobby/LobbyPage/Chat/ChatPanel.xml
@@ -6,7 +6,7 @@
 	<script directory="gui/lobby/LobbyPage/Chat/StatusMessages/"/>
 	<script directory="gui/lobby/LobbyPage/Chat/SystemMessages/"/>
 
-	<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"/>
 	<object name="chatSubmit" size="100%-72 100%-26 100%-4 100%-4" type="button" style="StoneButton">
 		<translatableAttribute id="caption">Send</translatableAttribute>
Index: source/gui/ObjectTypes/CList.h
===================================================================
--- source/gui/ObjectTypes/CList.h
+++ source/gui/ObjectTypes/CList.h
@@ -36,7 +36,7 @@
  */
 class CList : public IGUIObject, public IGUIScrollBarOwner, public IGUITextOwner
 {
-	GUI_OBJECT(CList, "list", GUIObjectFactory)
+	GUI_OBJECT(CList, "list", ListObjectFactory)
 
 public:
 	CList(CGUI& pGUI);
@@ -55,15 +55,17 @@
 	/**
 	 * Adds an item last to the list.
 	 */
-	virtual void AddItem(const CStrW& str, const CStrW& data);
+	virtual void AddItem(const CGUIString& str, const CGUIString& data);
 
 protected:
 
 	/**
 	 * Sets up text, should be called every time changes has been
 	 * made that can change the visual.
+	 * @param appendMode - if true, we assume we only need to render the new element at the end of the list.
 	 */
 	virtual void SetupText();
+	virtual void SetupText(bool appendMode);
 
 	/**
 	 * @see IGUIObject#HandleMessage()
Index: source/gui/ObjectTypes/CList.cpp
===================================================================
--- source/gui/ObjectTypes/CList.cpp
+++ source/gui/ObjectTypes/CList.cpp
@@ -92,15 +92,20 @@
 }
 
 void CList::SetupText()
+{
+	SetupText(false);
+}
+
+void CList::SetupText(bool appendMode)
 {
 	m_Modified = true;
 
 	m_ItemsYPositions.resize(m_List.m_Items.size() + 1);
 
-	// Delete all generated texts. Some could probably be saved,
-	//  but this is easier, and this function will never be called
-	//  continuously, or even often, so it'll probably be okay.
-	m_GeneratedTexts.clear();
+	if (!appendMode)
+		// Delete all generated texts.
+		// TODO: try to be cleverer if we want to update items before the end.
+		m_GeneratedTexts.clear();
 
 	float width = GetListRect().GetWidth();
 	// remove scrollbar if applicable
@@ -110,7 +115,10 @@
 	// Generate texts
 	float buffered_y = 0.f;
 
-	for (size_t i = 0; i < m_List.m_Items.size(); ++i)
+	if (appendMode)
+		buffered_y = m_ItemsYPositions[m_List.m_Items.size() - 1];
+
+	for (size_t i = appendMode ? m_List.m_Items.size() - 1 : 0; i < m_List.m_Items.size(); ++i)
 	{
 		CGUIText* text;
 
@@ -380,18 +388,11 @@
 	}
 }
 
-void CList::AddItem(const CStrW& str, const CStrW& data)
+void CList::AddItem(const CGUIString& str, const CGUIString& data)
 {
-	CGUIString gui_string;
-	gui_string.SetValue(str);
-
 	// Do not send a settings-changed message
-	m_List.m_Items.push_back(gui_string);
-
-	CGUIString data_string;
-	data_string.SetValue(data);
-
-	m_ListData.m_Items.push_back(data_string);
+	m_List.m_Items.push_back(str);
+	m_ListData.m_Items.push_back(data);
 
 	// TODO Temp
 	SetupText();
@@ -403,7 +404,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/ObjectTypes/COList.cpp
===================================================================
--- source/gui/ObjectTypes/COList.cpp
+++ source/gui/ObjectTypes/COList.cpp
@@ -192,7 +192,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/Scripting/JSInterface_IGUIObject.h
===================================================================
--- source/gui/Scripting/JSInterface_IGUIObject.h
+++ source/gui/Scripting/JSInterface_IGUIObject.h
@@ -22,6 +22,7 @@
 #include "js/Proxy.h"
 
 class CText;
+class CList;
 
 namespace JSI_GUI
 {
@@ -149,12 +150,20 @@
 		std::map<std::string, JS::PersistentRootedFunction> m_FunctionHandlers;
 		static js::Class m_ProxyObjectClass;
 	};
+
 	class TextObjectFactory : public GUIObjectFactory
 	{
 	public:
 		using cppType = CText;
 		TextObjectFactory(ScriptInterface& scriptInterface);
 	};
+
+	class ListObjectFactory : public GUIObjectFactory
+	{
+	public:
+		using cppType = CList;
+		ListObjectFactory(ScriptInterface& scriptInterface);
+	};
 }
 
 #endif // INCLUDED_JSI_IGUIOBJECT
Index: source/gui/Scripting/JSInterface_IGUIObject.cpp
===================================================================
--- source/gui/Scripting/JSInterface_IGUIObject.cpp
+++ source/gui/Scripting/JSInterface_IGUIObject.cpp
@@ -24,6 +24,7 @@
 #include "gui/CGUI.h"
 #include "gui/CGUISetting.h"
 #include "gui/ObjectBases/IGUIObject.h"
+#include "gui/ObjectTypes/CList.h"
 #include "gui/ObjectTypes/CText.h"
 #include "scriptinterface/ScriptExtraHeaders.h"
 #include "scriptinterface/ScriptInterface.h"
@@ -78,6 +79,13 @@
 	SetupHandler(&CText::GetTextSize, "getTextSize");
 }
 
+JSI_GUI::ListObjectFactory::ListObjectFactory(ScriptInterface& scriptInterface) : JSI_GUI::GUIObjectFactory(scriptInterface)
+{
+	JSAutoRequest rq(scriptInterface.GetContext());
+	SetupHandler(&CList::AddItem, "pushItem");
+}
+
+
 #undef SetupHandler
 
 /**