--- simplenews.module	2009-01-25 14:02:04.000000000 +0100
+++ simplenews.module.new	2009-01-25 14:01:27.000000000 +0100
@@ -372,6 +372,7 @@
       }
       break;
     case 'presave':
+      $node->simplenews=array_merge(simplenews_form_defaults(), is_array($node->simplenews) ? $node->simplenews : array());
       $term = simplenews_validate_taxonomy($node->taxonomy);
       $tid = is_array($term) ? array_values($term) : FALSE;
       $node->simplenews['tid'] = $tid ? $tid[0] : 0;
@@ -2411,3 +2412,16 @@
   $variables['unsubscribe_text'] = t('Unsubscribe from this newsletter', array(), $variables['language']->language);
   $variables['test_message'] = t('This is a test version of the newsletter.', array(), $variables['language']->language);
 }
+
+/**
+ * Get the defaults for the simplenews form.
+ */
+function simplenews_form_defaults() {
+  $defaults=array();
+  $defaults['s_format'] = variable_get('simplenews_format', 'plain');
+  $defaults['priority'] = variable_get('simplenews_priority', SIMPLENEWS_PRIORITY_NONE);
+  $defaults['receipt'] = variable_get('simplenews_receipt', 0);
+  $defaults['send'] = (user_access('send newsletter') ? variable_get('simplenews_send', SIMPLENEWS_COMMAND_SEND_NONE): SIMPLENEWS_COMMAND_SEND_NONE);      
+  $defaults['test_address'] = variable_get('simplenews_test_address', variable_get('site_mail', ini_get('sendmail_from')));  
+  return $defaults;
+}