diff --git a/src/game/WorldHandlers/MassMailMgr.h b/src/game/WorldHandlers/MassMailMgr.h
index d67fd431..2ee00142 100644
--- a/src/game/WorldHandlers/MassMailMgr.h
+++ b/src/game/WorldHandlers/MassMailMgr.h
@@ -117,7 +117,7 @@ class MassMailMgr
             }
 
             /// m_protoMail is owned by MassMail, so at copy original MassMail field set to NULL
-            std::auto_ptr<MailDraft> m_protoMail;
+            std::shared_ptr<MailDraft> m_protoMail;
 
             MailSender m_sender;
             ReceiversList m_receivers;
diff --git a/src/shared/Database/Database.cpp b/src/shared/Database/Database.cpp
index 05da57c8..157fcba1 100644
--- a/src/shared/Database/Database.cpp
+++ b/src/shared/Database/Database.cpp
@@ -670,7 +670,7 @@ bool Database::ExecuteStmt(const SqlStatementID& id, SqlStmtParameters* params)
 bool Database::DirectExecuteStmt(const SqlStatementID& id, SqlStmtParameters* params)
 {
     MANGOS_ASSERT(params);
-    std::auto_ptr<SqlStmtParameters> p(params);
+    std::shared_ptr<SqlStmtParameters> p(params);
     // execute statement
     SqlConnection::Lock _guard(getAsyncConnection());
     return _guard->ExecuteStmt(id.ID(), *params);