Use new mail option struture