email service sort senders refactored