diff --git a/src/game/Mail.cpp b/src/game/Mail.cpp
index c8c0b39de..d50e29275 100644
--- a/src/game/Mail.cpp
+++ b/src/game/Mail.cpp
@@ -816,6 +816,7 @@ MailSender::MailSender( Object* sender, MailStationery stationery ) : m_statione
             m_senderId = sender->GetEntry();
             break;
         case TYPEID_ITEM:
+        case TYPEID_CONTAINER:
             m_messageType = MAIL_ITEM;
             m_senderId = sender->GetEntry();
             break;
diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index 5d51acd8c..d35f23055 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -1611,7 +1611,7 @@ void Map::ScriptsStart(ScriptMapMap const& scripts, uint32 id, Object* source, O
     // prepare static data
     ObjectGuid sourceGuid = source->GetObjectGuid();
     ObjectGuid targetGuid = target ? target->GetObjectGuid() : ObjectGuid();
-    ObjectGuid ownerGuid  = (source->GetTypeId()==TYPEID_ITEM) ? ((Item*)source)->GetOwnerGuid() : ObjectGuid();
+    ObjectGuid ownerGuid  = source->isType(TYPEMASK_ITEM) ? ((Item*)source)->GetOwnerGuid() : ObjectGuid();
 
     ///- Schedule script execution for all scripts in the script map
     ScriptMap const *s2 = &(s->second);
@@ -1642,7 +1642,7 @@ void Map::ScriptCommandStart(ScriptInfo const& script, uint32 delay, Object* sou
     // prepare static data
     ObjectGuid sourceGuid = source->GetObjectGuid();
     ObjectGuid targetGuid = target ? target->GetObjectGuid() : ObjectGuid();
-    ObjectGuid ownerGuid  = (source->GetTypeId()==TYPEID_ITEM) ? ((Item*)source)->GetOwnerGuid() : ObjectGuid();
+    ObjectGuid ownerGuid  = source->isType(TYPEMASK_ITEM) ? ((Item*)source)->GetOwnerGuid() : ObjectGuid();
 
     ScriptAction sa;
     sa.sourceGuid = sourceGuid;
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index ccf80c1f0..638392b2c 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "11436"
+ #define REVISION_NR "11437"
 #endif // __REVISION_NR_H__