4 files changed, 84 insertions, 0 deletions
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index 9f47c20ba..6546bf23a 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -59,6 +59,7 @@
 #include "net/tmwa/familyhandler.h"
 #include "net/tmwa/friendshandler.h"
 #include "net/tmwa/homunculushandler.h"
+#include "net/tmwa/mail2handler.h"
 #include "net/tmwa/mailhandler.h"
 #include "net/tmwa/maphandler.h"
 #include "net/tmwa/markethandler.h"
@@ -103,6 +104,7 @@ GeneralHandler::GeneralHandler() :
     mFamilyHandler(new FamilyHandler),
     mFriendsHandler(new FriendsHandler),
     mHomunculusHandler(new HomunculusHandler),
+    mMail2Handler(new Mail2Handler),
     mMailHandler(new MailHandler),
     mMapHandler(new MapHandler),
     mMarketHandler(new MarketHandler),
@@ -145,6 +147,7 @@ GeneralHandler::~GeneralHandler()
     delete2(mFamilyHandler);
     delete2(mFriendsHandler);
     delete2(mHomunculusHandler);
+    delete2(mMail2Handler);
     delete2(mMailHandler);
     delete2(mMapHandler);
     delete2(mMarketHandler);
diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h
index d8aeb8efa..818cb4be3 100644
--- a/src/net/tmwa/generalhandler.h
+++ b/src/net/tmwa/generalhandler.h
@@ -54,6 +54,7 @@ class ElementalHandler;
 class FamilyHandler;
 class FriendsHandler;
 class HomunculusHandler;
+class Mail2Handler;
 class MailHandler;
 class MapHandler;
 class MarketHandler;
@@ -117,6 +118,7 @@ class GeneralHandler final : public Net::GeneralHandler
         FamilyHandler *mFamilyHandler;
         FriendsHandler *mFriendsHandler;
         HomunculusHandler *mHomunculusHandler;
+        Mail2Handler *mMail2Handler;
         MailHandler *mMailHandler;
         MapHandler *mMapHandler;
         MarketHandler *mMarketHandler;
diff --git a/src/net/tmwa/mail2handler.cpp b/src/net/tmwa/mail2handler.cpp
new file mode 100644
index 000000000..51d530c3a
--- /dev/null
+++ b/src/net/tmwa/mail2handler.cpp
@@ -0,0 +1,38 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2011-2017  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "net/tmwa/mail2handler.h"
+
+#include "debug.h"
+
+namespace TmwAthena
+{
+
+Mail2Handler::Mail2Handler()
+{
+    mail2Handler = this;
+}
+
+Mail2Handler::~Mail2Handler()
+{
+    mail2Handler = nullptr;
+}
+
+}  // namespace TmwAthena
diff --git a/src/net/tmwa/mail2handler.h b/src/net/tmwa/mail2handler.h
new file mode 100644
index 000000000..f130a1822
--- /dev/null
+++ b/src/net/tmwa/mail2handler.h
@@ -0,0 +1,41 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2011-2017  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NET_TMWA_MAIL2HANDLER_H
+#define NET_TMWA_MAIL2HANDLER_H
+
+#include "net/mail2handler.h"
+
+namespace TmwAthena
+{
+
+class Mail2Handler final : public Net::Mail2Handler
+{
+    public:
+        Mail2Handler();
+
+        A_DELETE_COPY(Mail2Handler)
+
+        ~Mail2Handler();
+};
+
+}  // namespace TmwAthena
+
+#endif  // NET_TMWA_MAIL2HANDLER_H