Issue #1 - Unittests for email module, refactoring, bugs fixing.