Added option to use encrypted mails
Fixed indentation and some old debugging