Tweak and revise the newly refactored Mail component