--- //c/jakarta-turbine/src/java/org/apache/turbine/util/mail/HtmlEmail.java	Sun May  6 13:06:45 2001
+++ ../src/java/org/apache/turbine/util/mail/HtmlEmail.java	Mon Jun 25 11:57:19 2001
@@ -98,13 +98,13 @@
  *
  * @author <a href="mailto:unknown">Regis Koenig</a>
  * @author <a href="mailto:sean@informage.net">Sean Legassick</a>
- * @version $Id: HtmlEmail.java,v 1.10 2001/05/06 17:06:45 jvanzyl Exp $
+ * @version $Id: HtmlEmail.java,v 1.1.1.1 2001/06/05 00:34:28 cfelaco Exp $
  */
 public class HtmlEmail
     extends MultiPartEmail
 {
-    protected MimeMultipart htmlContent;
-    
+    protected MimeMultipart htmlContent = new MimeMultipart();
+
     protected String text;
     protected String html;
 
@@ -207,13 +207,14 @@
         throws MessagingException
     {
         MimeBodyPart mbp = new MimeBodyPart();
-        htmlContent.addBodyPart( mbp );
 
         mbp.setDataHandler ( new DataHandler( new URLDataSource(url) ) );
         mbp.setFileName( name );
         mbp.setDisposition("inline");
         String cid = org.apache.turbine.util.GenerateUniqueId.getIdentifier();
         mbp.addHeader("Content-ID", cid);
+
+        htmlContent.addBodyPart( mbp );
         return mbp.getContentID();
     }
 
@@ -231,7 +232,7 @@
         if (StringUtils.isValid(text) && StringUtils.isValid(html))
         {
             // The message in text and HTML form.
-            MimeMultipart msg = new MimeMultipart();
+            MimeMultipart msg = htmlContent;
             msg.setSubType("alternative");
             main.setContent(msg);
             
@@ -285,4 +286,4 @@
         
         super.send();
     }
-}
\ No newline at end of file
+}