--- forward.module	2009-07-06 14:57:34.000000000 +0200
+++ forward.module	2009-07-06 14:58:34.000000000 +0200
@@ -174,6 +174,13 @@ function forward_admin_settings() {
     '#default_value' => variable_get('forward_allow_message', TRUE),
     '#description' => t('If checked, the user will be allowed to include a personal message in the body of the email'),
   );
+  $form['forward_options']['forward_required_message'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Require personal message'),
+    '#return_value' => 1,
+    '#default_value' => variable_get('forward_required_message', TRUE),
+    '#description' => t('If checked, the user will be required to include a personal message in the body of the email, this only works when personal messages are allowed.'),
+  );
   $form['forward_options']['forward_filter_html'] = array(
     '#type' => 'checkbox',
     '#title' => t('Allow HTML in personal messages'),
@@ -528,7 +535,7 @@ function forward_form(&$form_state, $pat
       '#cols' => 50,
       '#rows' => 10,
       '#description' => '',
-      '#required' => TRUE,
+      '#required' => variable_get('forward_required_message', TRUE),
     );
   }
   $form['message']['path'] = array(
@@ -629,7 +636,7 @@ function forward_form_validate($form, &$
       form_set_error('recipients', t(variable_get('forward_flood_error', 'You can\'t send more than %number messages per hour. Please try again later.'), array('%number' => variable_get('forward_flood_control', 10))));
     }
   }
-  if ((variable_get('forward_allow_message', TRUE)) && (empty($form_state['values']['message']))) {
+  if ((variable_get('forward_allow_message', TRUE)) && variable_get('forward_required_message', TRUE) && (empty($form_state['values']['message']))) {
     form_set_error('message', t('You must enter a message.'));
   }
 }