some changes to get the correct Mail Sizes