diff --git a/src/game/Mail.cpp b/src/game/Mail.cpp
index 24463acf8..146d57668 100644
--- a/src/game/Mail.cpp
+++ b/src/game/Mail.cpp
@@ -535,7 +535,7 @@ void WorldSession::HandleGetMailList(WorldPacket & recv_data )
 
         uint8 item_count = (*itr)->items.size();            // max count is MAX_MAIL_ITEMS (12)
 
-        size_t next_mail_size = 2+4+1+8+4*8+((*itr)->subject.size()+1)+1+item_count*(1+4+4+6*3*4+4+4+1+4+4+4);
+        size_t next_mail_size = 2+4+1+((*itr)->messageType == MAIL_NORMAL ? 8 : 4)+4*8+((*itr)->subject.size()+1)+1+item_count*(1+4+4+7*3*4+4+4+4+4+4+4+1);
 
         if(data.wpos()+next_mail_size > maxPacketSize)
         {
diff --git a/src/game/UpdateFields.h b/src/game/UpdateFields.h
index aa2ba6dde..27573bf88 100644
--- a/src/game/UpdateFields.h
+++ b/src/game/UpdateFields.h
@@ -19,7 +19,7 @@
 #ifndef _UPDATEFIELDS_AUTO_H
 #define _UPDATEFIELDS_AUTO_H
 
-// Auto generated for version 0, 3, 0, 10747
+// Auto generated for version 0, 3, 0, 10772
 
 enum EObjectFields
 {
diff --git a/src/realmd/AuthCodes.h b/src/realmd/AuthCodes.h
index 07ad4a08b..5812918fe 100644
--- a/src/realmd/AuthCodes.h
+++ b/src/realmd/AuthCodes.h
@@ -66,9 +66,9 @@ enum LoginResult
 
 // we need to stick to 1 version or half of the stuff will work for someone
 // others will not and opposite
-// will only support WoW, WoW:TBC and WoW:WotLK 3.3.0 client build 10747...
+// will only support WoW, WoW:TBC and WoW:WotLK 3.3.0 client build 10772...
 
-#define EXPECTED_MANGOS_CLIENT_BUILD        {10747, 0}
+#define EXPECTED_MANGOS_CLIENT_BUILD        {10772, 0}
 
 // At update excepted builds please update if need define DEFAULT_MAX_LEVEL
 // in DBCEnum.h to default max player level expected by build