Index: SOAPHeaderElement.class.php
===================================================================
--- SOAPHeaderElement.class.php	(revision 6141)
+++ SOAPHeaderElement.class.php	(working copy)
@@ -173,5 +173,5 @@
       return $s.'}';
     }
     
-  }
+  } implements(__FILE__, 'xml.soap.SOAPHeader');
 ?>
Index: SOAPMessage.class.php
===================================================================
--- SOAPMessage.class.php	(revision 6141)
+++ SOAPMessage.class.php	(working copy)
@@ -48,7 +48,7 @@
    */
   class SOAPMessage extends Tree {
     var 
-      $body         = '',
+      $body         = NULL,
       $namespace    = 'ctl',
       $encoding     = 'iso-8859-1',
       $nodeType     = 'SOAPNode',
@@ -71,8 +71,9 @@
      * @param   string action
      * @param   string method
      * @param   string targetNamespace default NULL
+     * @param   xml.soap.SOAPHeader[] headers default array()
      */
-    function create($action, $method, $targetNamespace= NULL) {
+    function create($action, $method, $targetNamespace= NULL, $headers= array()) {
       $this->action= $action;
       $this->method= $method;
 
@@ -85,8 +86,16 @@
         'SOAP-ENV:encodingStyle'      => XMLNS_SOAPENC,
         'xmlns:'.$this->namespace     => (NULL !== $targetNamespace ? $targetNamespace : $this->action)
       ));
-      $this->root->addChild(new Node('SOAP-ENV:Body'));
-      $this->root->children[0]->addChild(new Node($this->namespace.':'.$this->method));
+      
+      if (!empty($headers)) {
+        $header= &$this->root->addChild(new Node('SOAP-ENV:Header'));
+        for ($i= 0, $s= sizeof($headers); $i < $s; $i++) {
+          $header->addChild($headers[$i]->getNode($this->namespaces));
+        }
+      }
+      
+      $this->body= &$this->root->addChild(new Node('SOAP-ENV:Body'));
+      $this->body->addChild(new Node($this->namespace.':'.$this->method));
     }
     
     /**
@@ -103,7 +112,7 @@
       
       // Copy all of node's children to root element
       foreach (array_keys($node->children) as $i) {
-        $this->root->children[0]->children[0]->addChild($node->children[$i]);
+        $this->body->children[0]->addChild($node->children[$i]);
       }
     }
 
Index: SOAPHeader.class.php
===================================================================
--- SOAPHeader.class.php	(revision 0)
+++ SOAPHeader.class.php	(revision 0)
@@ -0,0 +1,25 @@
+<?php
+/* This class is part of the XP framework
+ *
+ * $Id$ 
+ */
+
+  /**
+   * SOAP Header interface
+   *
+   * @see      xp://xml.soap.SOAPHeaderElement
+   * @purpose  Interface
+   */
+  class SOAPHeader extends Interface {
+
+    /**
+     * Retrieve XML representation of this header for use in a SOAP
+     * message.
+     *
+     * @access  public
+     * @param   array<string, string> ns list of namespaces
+     * @return  &xml.Node
+     */
+    function &getNode($ns) { }
+  }
+?>
Index: SOAPClient.class.php
===================================================================
--- SOAPClient.class.php	(revision 6141)
+++ SOAPClient.class.php	(working copy)
@@ -29,7 +29,8 @@
       $transport          = NULL,
       $action             = '',
       $targetNamespace    = NULL,
-      $mapping            = NULL;
+      $mapping            = NULL,
+      $headers            = array();
     
     /**
      * Constructor
@@ -88,6 +89,18 @@
     }
     
     /**
+     * Add a header
+     *
+     * @access  public
+     * @param   &xml.soap.SOAPHeader header
+     * @return  &xml.soap.SOAPHeader the header added
+     */
+    function &addHeader(&$header) {
+      $this->headers[]= &$header;
+      return $header;
+    }
+    
+    /**
      * Invoke method call
      *
      * @access  public
@@ -106,7 +119,7 @@
       
       $message= &new SOAPMessage();
       $message->setEncoding($this->encoding);
-      $message->create($this->action, array_shift($args), $this->targetNamespace);
+      $message->create($this->action, array_shift($args), $this->targetNamespace, $this->headers);
       $message->setData($args, $this->mapping);
 
       // Send