6 files changed, 18 insertions, 0 deletions
diff --git a/src/net/eathena/mailhandler.cpp b/src/net/eathena/mailhandler.cpp
index ee8adee14..006c5e9a2 100644
--- a/src/net/eathena/mailhandler.cpp
+++ b/src/net/eathena/mailhandler.cpp
@@ -97,4 +97,11 @@ void MailHandler::deleteMessage(const int msgId)
     outMsg.writeInt32(msgId, "message id");
 }
 
+void MailHandler::returnMessage(const int msgId)
+{
+    MessageOut outMsg(CMSG_MAIL_RETURN_MESSAGE);
+    outMsg.writeInt32(msgId, "message id");
+    outMsg.writeString("", 24, "unused");
+}
+
 }  // namespace EAthena
diff --git a/src/net/eathena/mailhandler.h b/src/net/eathena/mailhandler.h
index 8f93de4ef..a90f3cbea 100644
--- a/src/net/eathena/mailhandler.h
+++ b/src/net/eathena/mailhandler.h
@@ -46,6 +46,8 @@ class MailHandler final : public MessageHandler, public Net::MailHandler
 
         void deleteMessage(const int msgId) override final;
 
+        void returnMessage(const int msgId) override final;
+
     protected:
         void processMailOpen(Net::MessageIn &msg) const;
 };
diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h
index ee8a30639..1196988aa 100644
--- a/src/net/eathena/protocol.h
+++ b/src/net/eathena/protocol.h
@@ -370,6 +370,7 @@
 #define CMSG_MAIL_READ_MESSAGE       0x0241
 #define CMSG_MAIL_GET_ATTACH         0x0244
 #define CMSG_MAIL_DELETE_MESSAGE     0x0243
+#define CMSG_MAIL_RETURN_MESSAGE     0x0273
 
 #define SMSG_SOLVE_CHAR_NAME         0x0194
 #define SMSG_SKILL_CASTING           0x07fb
diff --git a/src/net/mailhandler.h b/src/net/mailhandler.h
index 9c67acf1c..086c537b8 100644
--- a/src/net/mailhandler.h
+++ b/src/net/mailhandler.h
@@ -39,6 +39,8 @@ class MailHandler notfinal
         virtual void getAttach(const int msgId) = 0;
 
         virtual void deleteMessage(const int msgId) = 0;
+
+        virtual void returnMessage(const int msgId) = 0;
 };
 
 }  // namespace Net
diff --git a/src/net/tmwa/mailhandler.cpp b/src/net/tmwa/mailhandler.cpp
index 8483c46c1..e4e682266 100644
--- a/src/net/tmwa/mailhandler.cpp
+++ b/src/net/tmwa/mailhandler.cpp
@@ -58,4 +58,8 @@ void MailHandler::deleteMessage(const int msgId A_UNUSED)
 {
 }
 
+void MailHandler::returnMessage(const int msgId A_UNUSED)
+{
+}
+
 }  // namespace TmwAthena
diff --git a/src/net/tmwa/mailhandler.h b/src/net/tmwa/mailhandler.h
index c5111548d..d55093808 100644
--- a/src/net/tmwa/mailhandler.h
+++ b/src/net/tmwa/mailhandler.h
@@ -44,6 +44,8 @@ class MailHandler final : public MessageHandler, public Net::MailHandler
         void getAttach(const int msgId) override final;
 
         void deleteMessage(const int msgId) override final;
+
+        void returnMessage(const int msgId) override final;
 };
 
 }  // namespace TmwAthena