adding mail support to setup