3 files changed, 3 insertions, 7 deletions
diff --git a/src/net/mailhandler.h b/src/net/mailhandler.h
index 70b5796b7..8d53c739b 100644
--- a/src/net/mailhandler.h
+++ b/src/net/mailhandler.h
@@ -55,4 +55,6 @@ class MailHandler notfinal
 
 }  // namespace Net
 
+extern Net::MailHandler *mailHandler;
+
 #endif  // NET_MAILHANDLER_H
diff --git a/src/net/net.cpp b/src/net/net.cpp
index 06768cb43..4e904778c 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -52,6 +52,7 @@ namespace Net
     class GuildHandler;
     class InventoryHandler;
     class LoginHandler;
+    class MailHandler;
 }
 
 Net::AdminHandler *adminHandler = nullptr;
@@ -112,11 +113,6 @@ Net::ServerFeatures *Net::getServerFeatures()
     return serverFeatures;
 }
 
-Net::MailHandler *Net::getMailHandler()
-{
-    return mailHandler;
-}
-
 
 namespace Net
 {
diff --git a/src/net/net.h b/src/net/net.h
index a2c1c90b1..b1e6a52ca 100644
--- a/src/net/net.h
+++ b/src/net/net.h
@@ -36,7 +36,6 @@
 namespace Net
 {
 
-class MailHandler;
 class NpcHandler;
 class PartyHandler;
 class PetHandler;
@@ -52,7 +51,6 @@ PlayerHandler *getPlayerHandler() A_WARN_UNUSED;
 SkillHandler *getSkillHandler() A_WARN_UNUSED;
 TradeHandler *getTradeHandler() A_WARN_UNUSED;
 ServerFeatures *getServerFeatures() A_WARN_UNUSED;
-MailHandler *getMailHandler() A_WARN_UNUSED;
 
 ServerInfo::Type getNetworkType() A_WARN_UNUSED;