refactored to use Email::Stuffer