diff --git a/src/de/steamwar/bungeecore/listeners/ChatListener.java b/src/de/steamwar/bungeecore/listeners/ChatListener.java
index 6591258e..723f095a 100644
--- a/src/de/steamwar/bungeecore/listeners/ChatListener.java
+++ b/src/de/steamwar/bungeecore/listeners/ChatListener.java
@@ -155,20 +155,26 @@ public class ChatListener extends BasicListener {
             message = ChatColor.translateAlternateColorCodes('&', message);
         }
 
-        String msg = name + "§7» " +  chatcolor + message;
+        String msg = name + "§7»" +  chatcolor + " " + message;
         if(user.getTeam() != 0){
             msg = "§8" + Team.get(user.getTeam()).getTeamKuerzel() + " §r" + msg;
         }
 
+        String[] msgSplits = msg.split(" ");
+        StringBuilder builder = new StringBuilder();
+
         for(ProxiedPlayer target  : ProxyServer.getInstance().getPlayers()){
             Subserver targetServer = Subserver.getSubserver(target);
-            if(targetServer == null || targetServer.getType() != Servertype.ARENA || targetServer.getServer() != target.getServer().getInfo()){
-                if(msg.contains("@" + target.getName())) {
-                    BungeeCore.send(target, ChatMessageType.CHAT, msg.replace("@" + target.getName(), "§e@" + target.getName() + chatcolor));
+            if(!(targetServer == null || targetServer.getType() != Servertype.ARENA || targetServer.getServer() != target.getServer().getInfo())) continue;
+            for (String curr : msgSplits) {
+                if(curr.equalsIgnoreCase("@" + target.getName())) {
+                    builder.append("§e@").append(target.getName()).append(chatcolor).append(" ");
                 }else {
-                    BungeeCore.send(target, ChatMessageType.CHAT, msg);
+                    builder.append(curr).append(" ");
                 }
             }
+            BungeeCore.send(target, ChatMessageType.CHAT, builder.toString());
+            builder = new StringBuilder();
         }
         BungeeCore.log(sender.getServer().getInfo(), msg);
     }
@@ -209,7 +215,7 @@ public class ChatListener extends BasicListener {
             last = "";
         for(ProxiedPlayer player : ProxyServer.getInstance().getPlayers()){
             String name = player.getName();
-            if(last.isEmpty() || name.startsWith(last)){
+            if (last.isEmpty() || name.startsWith(last)) {
                 suggestions.add(name);
             }
         }