Fixes bug when mail is changed externally
Fixes comment spacing
Merge pull request #2 from Arni/mail_from_provider_bug

Fixes bug when mail is changed externally