working on more email support