tiny tiny change in Mail class