diff --git a/Minecraft.Client/Common/Consoles_App.cpp b/Minecraft.Client/Common/Consoles_App.cpp
index f7dda71d..fbec7624 100644
--- a/Minecraft.Client/Common/Consoles_App.cpp
+++ b/Minecraft.Client/Common/Consoles_App.cpp
@@ -6674,6 +6674,7 @@ wstring CMinecraftApp::FormatChatMessage(const wstring& desc, bool applyColor)
 
 	swprintf(replacements, 64, (applyColor ? colorFormatString.data() : L""), GetHTMLColour(eHTMLColor_f), 0xFFFFFFFF);
 	results = replaceAll(results, L"§f", replacements);
+	results = replaceAll(results, L"§r", replacements); //we only support color so reset is the same as white color
 
 	std::wsmatch match;
 	while (std::regex_search(results, match, IDS_Pattern)) {
diff --git a/Minecraft.Client/Gui.cpp b/Minecraft.Client/Gui.cpp
index ed1e429b..7e056e15 100644
--- a/Minecraft.Client/Gui.cpp
+++ b/Minecraft.Client/Gui.cpp
@@ -1566,7 +1566,7 @@ void Gui::addMessage(const wstring& _string,int iPad,bool bIsDeathMessage)
 		}
 
 		// if a space was found, include the space on this line
-		if(iLast!=i)
+		if(iLast!=cutOffset)
 		{
 			iLast++;
 		}