Fixed mass mail bug