add email feature ready (with test) - Fixed #95