diff --git a/src/de/steamwar/bungeecore/listeners/ChatListener.java b/src/de/steamwar/bungeecore/listeners/ChatListener.java
index a387104b..664bffb2 100644
--- a/src/de/steamwar/bungeecore/listeners/ChatListener.java
+++ b/src/de/steamwar/bungeecore/listeners/ChatListener.java
@@ -155,7 +155,7 @@ 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;
         }
@@ -164,7 +164,15 @@ public class ChatListener extends BasicListener {
             Subserver targetServer = Subserver.getSubserver(target);
             if(targetServer == null || targetServer.getType() != Servertype.ARENA || targetServer.getServer() != target.getServer().getInfo()){
                 if(msg.toLowerCase().contains("@" + target.getName().toLowerCase())) {
-                    BungeeCore.send(target, ChatMessageType.CHAT, msg.replace("@" + target.getName(), "§e@" + target.getName() + chatcolor));
+                    String toSend = "";
+                    for (String curr : msg.split(" ")) {
+                        if(curr.equalsIgnoreCase("@" + target.getName())) {
+                            toSend += "§e@" + target.getName() + chatcolor + " ";
+                        }else {
+                            toSend += curr + " ";
+                        }
+                    }
+                    BungeeCore.send(target, ChatMessageType.CHAT, toSend);
                 }else {
                     BungeeCore.send(target, ChatMessageType.CHAT, msg);
                 }
@@ -208,8 +216,8 @@ public class ChatListener extends BasicListener {
         else
             last = "";
         for(ProxiedPlayer player : ProxyServer.getInstance().getPlayers()){
-            String name = player.getName().replace("@", "");
-            if(last.isEmpty() || name.startsWith(last)){
+            String name = player.getName();
+            if (last.isEmpty() || name.startsWith(last)) {
                 suggestions.add(name);
             }
         }