Tweak to the newly revised Mail component