Update PHPMailer to version 2.0.4 (ticket #733)
removed PHPMailer fix introduced with 2.0.3 to get SMTP working again (line 1041 in class.smtp.php)
updated external PHPMailer class to latest version (v2.3)
Added keywords to files where they are missing
updated PHPMailer framework to version 2.0.0 (/include/phpmailer)