added more email features