diff --git a/src/de/ctdo/crashtest/irc/IrcClient.java b/src/de/ctdo/crashtest/irc/IrcClient.java
index 7870a37..4c10f2c 100644
--- a/src/de/ctdo/crashtest/irc/IrcClient.java
+++ b/src/de/ctdo/crashtest/irc/IrcClient.java
@@ -49,8 +49,14 @@ public class IrcClient implements IIrcClient, jerklib.events.listeners.IRCEventL
             String message = cme.getMessage();
             final String nick = ircsession.getNick();
             
-            if(message.contains(nick)) {
-                message = message.substring(Math.max(nick.length(), message.indexOf(":")+1));
+            if(message.startsWith(nick) || message.startsWith(">")) {
+                if(message.startsWith(nick)) {
+                    message = message.substring(Math.max(nick.length(), message.indexOf(":")+1));
+                }
+                else {
+                    message = message.substring(1);
+                }
+
                 message = message.trim();
 
                 for(IRCEventListener listenerIRC : listenerListIRC) {