diff --git a/src/main/java/cat/nyaa/ukit/SpigotLoader.java b/src/main/java/cat/nyaa/ukit/SpigotLoader.java
index 727fd4c..69acb9b 100644
--- a/src/main/java/cat/nyaa/ukit/SpigotLoader.java
+++ b/src/main/java/cat/nyaa/ukit/SpigotLoader.java
@@ -290,13 +290,6 @@ private boolean setupEconomy() {
         return economyProvider != null;
     }
 
-    public void newLoginPush(UUID playerUniqueID, Component message, Component messageSender) throws SQLException, IllegalStateException {
-        if (loginPushFunction == null) {
-            throw new IllegalStateException("LoginPushFunction not initialized");
-        }
-        loginPushFunction.getLoginPushRecorder().createLoginPush(playerUniqueID, message, messageSender);
-    }
-
     private boolean setupChat() {
         var rsp = Bukkit.getServicesManager().getRegistration(Chat.class);
         if (rsp != null) {
diff --git a/src/main/java/cat/nyaa/ukit/mail/MailFunction.java b/src/main/java/cat/nyaa/ukit/mail/MailFunction.java
index e30ce5c..07e49b9 100644
--- a/src/main/java/cat/nyaa/ukit/mail/MailFunction.java
+++ b/src/main/java/cat/nyaa/ukit/mail/MailFunction.java
@@ -2,6 +2,7 @@
 
 import cat.nyaa.ukit.MainLang;
 import cat.nyaa.ukit.SpigotLoader;
+import cat.nyaa.ukit.api.UKitAPI;
 import cat.nyaa.ukit.utils.EssentialsPluginUtils;
 import cat.nyaa.ukit.utils.LockettePluginUtils;
 import cat.nyaa.ukit.utils.SubCommandExecutor;
@@ -213,16 +214,8 @@ public boolean invokeCommand(CommandSender commandSender, Command command, Strin
                         Pair.of("amount", itemInHand.getAmount())
                 );
 
-                if (targetPlayer.isOnline()) {
-                    targetPlayer.getPlayer().sendMessage(receiverMessage);
-                } else {
-                    try {
-                        var serviceSenderName = getLanguage().mailLang.serviceName.produceAsComponent();
-                        pluginInstance.newLoginPush(targetPlayer.getUniqueId(), receiverMessage, serviceSenderName);
-                    } catch (SQLException | IllegalStateException ignore) {
-                        ignore.printStackTrace();
-                    }
-                }
+                var serviceSenderName = getLanguage().mailLang.serviceName.produceAsComponent();
+                UKitAPI.getAPIInstance().pushMessage(targetPlayer.getUniqueId(), receiverMessage, serviceSenderName);
 
             } catch (SQLException e) {
                 e.printStackTrace();