Merge pull request #301 from hsz/master
Fixed dovecot and samba encryption - (invalid variables names)