diff --git a/galaxy/src/main/java/com/alttd/chat/commands/Message.java b/galaxy/src/main/java/com/alttd/chat/commands/Message.java
index e5f20bd..e3a0cc9 100644
--- a/galaxy/src/main/java/com/alttd/chat/commands/Message.java
+++ b/galaxy/src/main/java/com/alttd/chat/commands/Message.java
@@ -9,17 +9,17 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-public class Message  implements CommandExecutor {
+public class Message implements CommandExecutor {
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         if(!(sender instanceof Player player)) {
             return true;
         }
-        ChatUser user = ChatUserManager.getChatUser(player.getUniqueId());
-        user.setReplyContinueTarget(args[0]);
         if(args.length < 2) return false; // todo error message or command info
 
+        ChatUser user = ChatUserManager.getChatUser(player.getUniqueId());
+        user.setReplyContinueTarget(args[0]);
         String message = StringUtils.join(args, " ", 1, args.length);
         ChatPlugin.getInstance().getChatHandler().privateMessage(player, args[0], message);
         return false;
diff --git a/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java b/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java
index ed2d90d..614dd35 100755
--- a/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java
+++ b/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java
@@ -41,7 +41,7 @@ public class ChatHandler {
 //        user.setReplyTarget(target);
         ModifiableString modifiableString = new ModifiableString(message);
         // todo a better way for this
-        if(!RegexManager.filterText(player.getName(), player.getUniqueId(), modifiableString, "privatemessage")) {
+        if(!RegexManager.filterText(player.getName(), player.getUniqueId(), modifiableString,  "privatemessage")) {
             GalaxyUtility.sendBlockedNotification("DM Language",
                     player,
                     Utility.parseMiniMessage(Utility.parseColors(modifiableString.string())),
@@ -59,7 +59,7 @@ public class ChatHandler {
         updatedMessage = Utility.formatText(updatedMessage);
 
         TagResolver placeholders = TagResolver.resolver(
-                Placeholder.parsed("message", updatedMessage),
+                Placeholder.component("message", Utility.parseMiniMessage(updatedMessage)),
                 Placeholder.component("sendername", player.name()),
                 Placeholder.parsed("receivername", target)
         );
@@ -98,16 +98,19 @@ public class ChatHandler {
 
         updatedMessage = Utility.formatText(updatedMessage);
 
+        Component messageComponent = Utility.parseMiniMessage(updatedMessage)
+                .replaceText(TextReplacementConfig.builder().once().matchLiteral("[i]")
+                        .replacement(ChatHandler.itemComponent(player.getInventory().getItemInMainHand())).build());
         TagResolver placeholders = TagResolver.resolver(
-                Placeholder.parsed("message", updatedMessage),
+                Placeholder.component("message", messageComponent),
                 Placeholder.component("sendername", player.name()),
                 Placeholder.parsed("receivername", target)
         );
 
-        Component component = Utility.parseMiniMessage("<message>", placeholders)
-                .replaceText(TextReplacementConfig.builder().once().matchLiteral("[i]").replacement(ChatHandler.itemComponent(player.getInventory().getItemInMainHand())).build());
+//        Component component = Utility.parseMiniMessage("<message>", placeholders)
+//                .replaceText(TextReplacementConfig.builder().once().matchLiteral("[i]").replacement(ChatHandler.itemComponent(player.getInventory().getItemInMainHand())).build());
 
-        sendPrivateMessage(player, target, "privatemessage", component);
+        sendPrivateMessage(player, target, "privatemessage", messageComponent);
         Component spymessage = Utility.parseMiniMessage(Config.MESSAGESPY, placeholders);
         for(Player pl : Bukkit.getOnlinePlayers()) {
             if(pl.hasPermission(Config.SPYPERMISSION) && ChatUserManager.getChatUser(pl.getUniqueId()).isSpy() && !pl.equals(player) && !pl.getName().equalsIgnoreCase(target)) {
@@ -157,7 +160,7 @@ public class ChatHandler {
         TagResolver placeholders = TagResolver.resolver(
                 Placeholder.component("sender", senderName),
                 Placeholder.component("prefix", prefix),
-                Placeholder.parsed("message", updatedMessage),
+                Placeholder.component("message", Utility.parseMiniMessage(updatedMessage)),
                 Placeholder.parsed("server", Bukkit.getServerName())
         );
 
@@ -196,7 +199,7 @@ public class ChatHandler {
 
         TagResolver placeholders = TagResolver.resolver(
                 Placeholder.component("sender", senderName),
-                Placeholder.parsed("message", updatedMessage),
+                Placeholder.component("message", Utility.parseMiniMessage(updatedMessage)),
                 Placeholder.parsed("server", Bukkit.getServerName()),
                 Placeholder.parsed("channel", channel.getChannelName())
         );
diff --git a/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java b/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java
index 1ad7780..b624e1a 100755
--- a/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java
+++ b/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java
@@ -12,6 +12,7 @@ import com.alttd.chat.util.GalaxyUtility;
 import com.alttd.chat.util.Utility;
 import io.papermc.paper.chat.ChatRenderer;
 import io.papermc.paper.event.player.AsyncChatEvent;
+import jdk.jshell.execution.Util;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.TextReplacementConfig;
@@ -65,12 +66,13 @@ public class ChatListener implements Listener, ChatRenderer {
             message = Utility.parseColors(message);
         }
 
-        message = Utility.formatText(message);
-        TagResolver placeholders = TagResolver.resolver(
-                Placeholder.unparsed("message", message)
-        );
-
-        Component component = Utility.parseMiniMessage("<message>", placeholders)
+        Component component = Utility.parseMiniMessage(Utility.formatText(message));
+//        message = Utility.formatText(message);
+//        TagResolver placeholders = TagResolver.resolver(
+//                Placeholder.unparsed("message", message)
+//        );
+        component = component
+//        Component component = Utility.parseMiniMessage("<message>", placeholders)
                 .replaceText(TextReplacementConfig.builder().once().matchLiteral("[i]").replacement(ChatHandler.itemComponent(player.getInventory().getItemInMainHand())).build());
 
         event.message(component);
diff --git a/velocity/src/main/java/com/alttd/velocitychat/handlers/ChatHandler.java b/velocity/src/main/java/com/alttd/velocitychat/handlers/ChatHandler.java
index 6274bcd..7ad659e 100755
--- a/velocity/src/main/java/com/alttd/velocitychat/handlers/ChatHandler.java
+++ b/velocity/src/main/java/com/alttd/velocitychat/handlers/ChatHandler.java
@@ -135,7 +135,7 @@ public class ChatHandler {
                 Placeholder.component("sender", senderName),
                 Placeholder.component("sendername", senderName),
                 Placeholder.unparsed("partyname", party.getPartyName()),
-                Placeholder.unparsed("message", updatedMessage),
+                Placeholder.component("message", Utility.parseMiniMessage(updatedMessage)),
                 Placeholder.unparsed("server", serverConnection.getServer().getServerInfo().getName())
         );
 
@@ -171,7 +171,7 @@ public class ChatHandler {
         }
 
         TagResolver Placeholders = TagResolver.resolver(
-                Placeholder.unparsed("message", message),
+                Placeholder.component("message", Utility.parseMiniMessage(message)),
                 Placeholder.component("sender", senderName),
                 Placeholder.unparsed("server", serverName));
 
@@ -236,7 +236,7 @@ public class ChatHandler {
             TagResolver Placeholders = TagResolver.resolver(
                     Placeholder.component("staffprefix", chatUser.getStaffPrefix()),
                     Placeholder.component("sender", chatUser.getDisplayName()),
-                    Placeholder.unparsed("message", mail.getMessage()),
+                    Placeholder.component("message", Utility.parseMiniMessage(mail.getMessage())),
                     Placeholder.unparsed("date", new Date(mail.getSendTime()).toString())
             );
             Component mailMessage = Utility.parseMiniMessage(Config.mailBody, Placeholders);
diff --git a/velocity/src/main/java/com/alttd/velocitychat/listeners/ChatListener.java b/velocity/src/main/java/com/alttd/velocitychat/listeners/ChatListener.java
index 4db7bc1..56524ff 100755
--- a/velocity/src/main/java/com/alttd/velocitychat/listeners/ChatListener.java
+++ b/velocity/src/main/java/com/alttd/velocitychat/listeners/ChatListener.java
@@ -35,7 +35,7 @@ public class ChatListener {
 
         Component message = Utility.parseMiniMessage(Config.GACFORMAT,
                 Placeholder.parsed("sender", senderName),
-                Placeholder.parsed("message", event.getMessage()),
+                Placeholder.component("message", Utility.parseMiniMessage(event.getMessage())),
                 Placeholder.parsed("server", serverName)
         );