Added option to use encrypted mails
Fixed indentation and some old debugging
Merge branch 'develop/6' into develop/7