added check to fix warnings
moved email installation function usage
update changelog
Merge pull request #997 from KrzysztofBorbis/master

Fixed emails creating and warnings on update