diff --git a/kernel/branches/net/applications/ircc/serverparser.inc b/kernel/branches/net/applications/ircc/serverparser.inc
index 7333123057..267987e24c 100644
--- a/kernel/branches/net/applications/ircc/serverparser.inc
+++ b/kernel/branches/net/applications/ircc/serverparser.inc
@@ -41,7 +41,7 @@ server_parser:
         ret
 
   .got_cmd:
-        jmp     dword[edi]
+        jmp     dword[edi] 
 
 
 server_commands:
@@ -195,6 +195,8 @@ cmd_ping:
 
 cmd_privmsg:
 
+        add     esi, 8  ; skip 'PRIVMSG '
+
 ; Check if it was destined for me privately
         mov     edi, servercommand+1
         call    compare_to_nick
@@ -490,6 +492,8 @@ cmd_join:
         mov     [ebx + window.data_ptr], eax
         mov     [ebx + window.type], WINDOWTYPE_CHANNEL
         mov     [ebx + window.flags], 0
+
+        add     esi, 5  ; skip 'JOIN '  ; FIXME: perhaps scan for spaces instead?
         call    window_set_name
 
         mov     [window_open], ebx