#327 #328 Update Email with new interface and more