[email] refactor #561