Optimized editMail functionality..