BLK-11 Tests and removes threading from email block

Signed-off-by: Oren Leiman <oren@neutral.io>