Updated the phpmailer.
And new config setting for phpmailer.
Also uploaded a whole lot of fixes from 4.0
modified tills fix dave posted: encription_key only required when
encritpion is enabled.