--- simplenews_template.module	2009-03-18 00:00:09.718750000 +0100
+++ simplenews_template.module	2009-03-18 12:27:35.343750000 +0100
@@ -113,9 +113,12 @@
   $style = _simplenews_template_get_css($tid);
   $bgcolor = _simplenews_template_get_bgcolor($tid);
 
-  // Markup node body with Simplenews Template style
-  $content = theme('simplenews_template_mail', $newsletter->name, $node->title, $content, $style, $bgcolor);
-
+   
+  if (is_null($message['body'])) {
+    // Markup node body with Simplenews Template style
+    $content = theme('simplenews_template_mail', $newsletter->name, $node->title, $content, $style, $bgcolor);
+  }
+  
   // Run HTML and CSS through Emogrifier, if available
   $content = _simplenews_template_emogrify($content, $css);