--- flag.module.orig	2009-01-12 16:52:04.000000000 -0200
+++ flag.module	2009-01-12 16:57:51.000000000 -0200
@@ -597,6 +597,14 @@ function flag_form(&$form_state, $name, 
     '#access' => empty($flag->locked['flag_confirmation']),
   );
 
+  $form['flag_confirmation_description'] = array(
+    '#type' => 'textarea',
+    '#title' => t('Description of flag confirmation message'),
+    '#default_value' => $flag->flag_confirmation_description,
+    '#description' => t('Description of the message displayed if the user has clicked the "flag this" link and confirmation is required."'),
+    '#access' => empty($flag->locked['flag_confirmation_description']),
+  );
+  
   $form['flag_message'] = array(
     '#type' => 'textfield',
     '#title' => t('Flagged message'),
@@ -630,6 +638,14 @@ function flag_form(&$form_state, $name, 
     '#access' => empty($flag->locked['unflag_confirmation']),
   );
 
+  $form['unflag_confirmation_description'] = array(
+    '#type' => 'textarea',
+    '#title' => t('Description of unflag confirmation message'),
+    '#default_value' => $flag->unflag_confirmation_description,
+    '#description' => t('Description of the message displayed if the user has clicked the "unflag this" link and confirmation is required."'),
+    '#access' => empty($flag->locked['unflag_confirmation_description']),
+  );
+  
   $form['unflag_message'] = array(
     '#type' => 'textfield',
     '#title' => t('Unflagged message'),
@@ -888,8 +904,9 @@ function flag_confirm(&$form_state, $act
   $question = $flag->get_label($action .'_confirmation', $content_id);
   $path = isset($_GET['destination']) ? $_GET['destination'] : '<front>';
   $yes = $flag->get_label($action .'_short', $content_id);
-
-  return confirm_form($form, $question, $path, '', $yes);
+  $description = check_markup($flag->get_label($action .'_confirmation_description', $content_id));
+  
+  return confirm_form($form, $question, $path, $description, $yes);
 }
 
 function flag_confirm_submit(&$form, &$form_state) {