diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp
index bbf018587..b295d9800 100644
--- a/src/ClientHandle.cpp
+++ b/src/ClientHandle.cpp
@@ -1550,7 +1550,14 @@ void cClientHandle::HandleChat(const AString & a_Message)
 	Msg.AddTextPart(m_Player->GetName(), Color);
 	Msg.ParseText(m_Player->GetSuffix());
 	Msg.AddTextPart("> ");
-	Msg.ParseText(Message);
+	if (m_Player->HasPermission("chat.format"))
+	{
+		Msg.ParseText(Message);
+	}
+	else
+	{
+		Msg.AddTextPart(Message);
+	}
 	Msg.UnderlineUrls();
 	cRoot::Get()->BroadcastChat(Msg);
 }