Partner mail bug fix