Updated and working.

IMFMessage.h

@@ -1,9 +1,12 @@
 #ifndef __IMFMessage_h__
 #define __IMFMessage_h__
 
+#include <sstream>
+#include <string>
+#include <vector>
 #include "ZString.h"
+#include "IMFMultipart.h"
 #include "IMFHeader.h"
-#include "IMFBody.h"
 
 namespace coreutils {
 
@@ -12,22 +15,26 @@ namespace coreutils {
     public:
       IMFMessage();
       IMFMessage(ZString &in);
+      virtual ~IMFMessage();
 
       void output(std::stringstream &out);
 
-      void addHeader(ZString key, ZString value);
-      void addHeader(const char *key, ZString value);
+      void addHeader(const char *key, std::string &value);
+      void addHeader(const char *key, const char *value);
+      void addHeader(ZString &key, ZString &value);
+      void addHeader(const char *key, ZString &value);
 
       ZString getHeader(ZString key, bool valueOnly = true);
       ZString getHeaderKeyPairValue(const char *headerKey, const char *key);
       ZString getHeaderKeyPairValue(ZString headerKey, ZString key);
 
-      IMFBody * getBody();
+      IMFMultipart multipart;
+      ZString block;
+      char contentLength[8];
 
     protected:
       std::vector<IMFHeader> headers;
- 
-      IMFBody *body;
+      std::stringstream newHeaders;
 
    };