Send zfo message via email. Minor code refactoring.
This will create a new commit in order to revert the existing changes.
