Emails send locally
Final changes