diff --git a/plugins/FeedsCSVParser.inc b/plugins/FeedsCSVParser.inc
index 5521c4835a6d94b02afa3820e5605f47cdd78c2d..b5161ed953fd5f1ddd11889c08bcd97946f7c2cf 100644
--- a/plugins/FeedsCSVParser.inc
+++ b/plugins/FeedsCSVParser.inc
@@ -132,7 +132,19 @@ class FeedsCSVParser extends FeedsParser {
     $items = array();
     $items[] = format_plural(count($uniques), t('Column <strong>!column</strong> is mandatory and considered unique: only one item per !column value will be created.', array('!column' => implode(', ', $uniques))), t('Columns <strong>!columns</strong> are mandatory and values in these columns are considered unique: only one entry per value in one of these column will be created.', array('!columns' => implode(', ', $uniques))));
     $items[] = l(t('Download a template'), 'import/' . $this->id . '/template');
-    $form['help']['#markup'] = '<div class="help"><p>' . $output . '</p>' . theme('item_list', array('items' => $items)) . '</div>';
+    $form['help'] = array(
+      '#prefix' => '<div class="help">',
+      '#suffix' => '</div>',
+      'description' => array(
+        '#prefix' => '<p>',
+        '#markup' => $output,
+        '#suffix' => '</p>',
+      ),
+      'list' => array(
+        '#theme' => 'item_list',
+        '#items' => $items,
+      ),
+    );
     $form['delimiter'] = array(
       '#type' => 'select',
       '#title' => t('Delimiter'),