--- classes/wacko.php.old	2005-08-26 23:03:19.000000000 +0400
+++ classes/wacko.php	2005-09-13 12:17:42.000000000 +0400
@@ -670,9 +670,10 @@ class Wacko
  function TagSearch($phrase) { return $this->LoadAll("select ".$this->pages_meta." from ".$this->config["table_prefix"]."pages where latest = 'Y' and lower(tag) like binary lower('%".quote($phrase)."%') order by supertag"); }
 
  function SendMail($email,$subject, $message) {
-   $headers = "From: \"".$this->GetConfigValue("wakka_name")."\"<".$this->GetConfigValue("admin_email").">\r\n";
+   $headers = "From: =?". $this->GetCharset() ."?B?". base64_encode($this->GetConfigValue("wakka_name")) ."?= <".$this->GetConfigValue("admin_email").">\r\n";
    $headers .= "X-Mailer: PHP/".phpversion()."\r\n"; //mailer
    $headers .= "X-Priority: 3\r\n"; //1 UrgentMessage, 3 Normal
+   $headers .= "X-Wacko: ".$this->GetConfigValue("base_url")."\r\n";
    $headers .= "Content-Type: text/html; charset=".$this->GetCharset()."\r\n";
    $subject =  "=?".$this->GetCharset()."?B?" . base64_encode($subject) . "?=";
    @mail($email, $subject, "<html><head></head><body>".$message."</body></html>", $headers);
