Fix email vendor saving

Fix issue #84