--- a/hedgewars/CCHandlers.inc	Sat Sep 26 20:54:13 2009 +0000
+++ b/hedgewars/CCHandlers.inc	Sun Sep 27 10:26:36 2009 +0000
@@ -336,21 +336,20 @@
 SendIPC('s' + s);
 
 if copy(s, 1, 4) = '/me ' then
-	s:= '* ' + UserNick + ' ' + copy(s, 5, Length(s) - 4)
+	s:= #2'* ' + UserNick + ' ' + copy(s, 5, Length(s) - 4)
 else
-	s:= UserNick + ': ' + s;
+	s:= #1 + UserNick + ': ' + s;
 
 AddChatString(s)
 end;
 
 procedure chTeamSay(var s: shortstring);
-var text: shortstring;
 begin
 SendIPC('b' + s);
 
-text:= copy(s, 2, Length(s)-1);
+s[1]:= #4;
 
-AddChatString(text)
+AddChatString(s)
 end;
 
 procedure chTimer(var s: shortstring);