add mail and sp support