improved Email provider