diff --git a/header.inc.php.template b/header.inc.php.template
index 62c0ec8fb4..b713e9dcf0 100644
--- a/header.inc.php.template
+++ b/header.inc.php.template
@@ -81,11 +81,11 @@
   \**************************************************************************/
   $phpgw_info["server"]["api_inc"] = $phpgw_info["server"]["include_root"]."/phpgwapi/inc";
   include($phpgw_info["server"]["server_root"]."/version.inc.php");
-  $phpgw_info["server"]["versions"]["header"] = "1.9";
+  $phpgw_info["server"]["versions"]["header"] = "1.10";
 // This is a fix for NT
   if (!isset($phpgw_info["flags"]["noapi"]) || 
       !$phpgw_info["flags"]["noapi"] == True){
-    include($phpgw_info["server"]["api_inc"] . "/phpgw.inc.php");
+    include($phpgw_info["server"]["api_inc"] . "/functions.inc.php");
   }
 
   // Leave off the final php closing tag, some editors will add
diff --git a/phpgwapi/inc/class.send.inc.php b/phpgwapi/inc/class.send.inc.php
index c8e4a63ccd..9578177ded 100644
--- a/phpgwapi/inc/class.send.inc.php
+++ b/phpgwapi/inc/class.send.inc.php
@@ -22,13 +22,14 @@ class send {
       $this->err["desc"] = " ";
     }
 
-    function msg($service, $to, $subject, $body, $msgtype="", $cc="", $bcc="") {
+    function msg($service, $to, $subject, $body, $msgtype="", $cc="", $bcc="", $from ="") {
       global $phpgw_info, $phpgw, $attach_sig;
+      if ($from ==""){ $from = $phpgw_info["user"]["fullname"]." <".$phpgw_info["user"]["preferences"]["email"]["address"].">"; }
 
       if ($service == "email") {
           $now = getdate();
           $header  = "Date: " . gmdate("D, d M Y H:i:s") . " +0000\n";
-          $header .= "From: ".$phpgw_info["user"]["fullname"]." <".$phpgw_info["user"]["preferences"]["email"]["address"].">\n";
+          $header .= "From: ".$from."\n";
           $header .= "Reply-To: ".$phpgw_info["user"]["preferences"]["email"]["address"]."\n";
           $header .= "To: $to\n";
           if (!empty($cc)) {
diff --git a/version.inc.php b/version.inc.php
index 8b80339c99..4308ac76c5 100644
--- a/version.inc.php
+++ b/version.inc.php
@@ -12,4 +12,4 @@
   /* $Id$ */
 
   $phpgw_info["server"]["versions"]["phpgwapi"] = "0.9.9";
-  $phpgw_info["server"]["versions"]["current_header"] = "1.9";
+  $phpgw_info["server"]["versions"]["current_header"] = "1.10";