diff --git a/client/src/main/java/ch/zhaw/pm2/multichat/client/ClientConnectionHandler.java b/client/src/main/java/ch/zhaw/pm2/multichat/client/ClientConnectionHandler.java
index 9da83da..9ff948a 100644
--- a/client/src/main/java/ch/zhaw/pm2/multichat/client/ClientConnectionHandler.java
+++ b/client/src/main/java/ch/zhaw/pm2/multichat/client/ClientConnectionHandler.java
@@ -28,7 +28,7 @@ public class ClientConnectionHandler implements Runnable {
     public static final String USER_NONE = "";
     public static final String USER_ALL = "*";
 
-    private final Pattern messagePattern = Pattern.compile( "^(?:@(\\w*))?\\s*(.*)$" );
+    private final Pattern messagePattern = Pattern.compile( "^(?:@(\\S*))?\\s*(.*)$" );
 
     private SimpleStringProperty userName;
     private SimpleObjectProperty<State> state;
@@ -63,7 +63,6 @@ public class ClientConnectionHandler implements Runnable {
 
     public void setState (State newState) {
         state.set(newState);
-
     }
 
     public void run () {