diff --git a/faqfield.module b/faqfield.module
index 90c885c..3f6b73e 100755
--- a/faqfield.module
+++ b/faqfield.module
@@ -37,8 +37,9 @@ function faqfield_field_info() {
         'answer_widget' => 'textarea',
         'format' => 0,
         'advanced' => array(
-          'question_length' => 255,
           'question_title'  => t('Question'),
+          'question_length' => 255,
+          'question_rows'   => 1,
           'answer_title'    => t('Answer'),
           'answer_rows'     => 3,
         ),
@@ -108,6 +109,16 @@ function faqfield_field_settings_form($field, $instance, $has_data) {
     '#collapsed' => TRUE,
   );
 
+  // Input for custom title of questions.
+  $form['advanced']['question_title'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Question input title'),
+    '#default_value' => $field['settings']['advanced']['question_title'],
+    '#description' => t('Custom title of question input.'),
+    '#maxlength' => 50,
+    '#size' => 20,
+  );
+
   // Input for the maximum length of questions.
   $form['advanced']['question_length'] = array(
     '#type' => 'textfield',
@@ -118,15 +129,15 @@ function faqfield_field_settings_form($field, $instance, $has_data) {
     '#maxlength' => 3,
     '#size' => 5,
   );
-
-  // Input for custom title of questions.
-  $form['advanced']['question_title'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Question input title'),
-    '#default_value' => $field['settings']['advanced']['question_title'],
-    '#description' => t('Custom title of question input.'),
-    '#maxlength' => 50,
-    '#size' => 20,
+  
+  // Input for the count of rows for the answer field.
+  $form['advanced']['question_rows'] = array(
+    '#type' => 'select',
+    '#title' => t('Question rows'),
+    '#default_value' => $field['settings']['advanced']['question_rows'],
+    '#options' => array(1 => '1 (Fieldset)', 2 => '2 (Textarea)', 3 => '3 (Textarea)', 4 => '4 (Textarea)'),
+    '#required' => TRUE,
+    '#description' => t('Number of rows used for the question textfield/textarea.'),
   );
 
   // Input for custom title of answers.
@@ -384,11 +395,12 @@ function faqfield_field_widget_form(&$form, &$form_state, $field, $instance, $la
     // Add textfield for question.
     $element['question'] = array(
       '#title' => check_plain($field['settings']['advanced']['question_title']),
-      '#type' => 'textfield',
+      '#type' => ($field['settings']['advanced']['question_rows'] == 1) ? 'textfield' : 'textarea',
       '#default_value' => $items[$delta]['question'],
       '#maxlength' => $field['settings']['advanced']['question_length'],
       '#delta' => $delta,
       '#weight' => 0,
+      '#rows' => $field['settings']['advanced']['question_rows'],
     ) + $base;
 
     // If we are displaying the default value (on field settings preview or