improved Email again