refactoring around extracting features from email
Revert "refactoring around extracting features from email"

This reverts commit 2a8deb1f3812116ff7a93bfa3945908fc1de8e08.