diff --git a/lib/WebGUI/Asset/Wobject/Survey.pm b/lib/WebGUI/Asset/Wobject/Survey.pm
index 8a56a59a4..8f023c745 100644
--- a/lib/WebGUI/Asset/Wobject/Survey.pm
+++ b/lib/WebGUI/Asset/Wobject/Survey.pm
@@ -712,12 +712,14 @@ sub www_editAnswer {
                 -name=>"answer",
                 -value=>$answer->{answer},
                 -label=>WebGUI::International::get(19,'Asset_Survey')
+                -hoverHelp=>WebGUI::International::get('19 description','Asset_Survey')
                 );
 	if ($self->get("mode") eq "quiz") {
         	$f->yesNo(
                 	-name=>"isCorrect",
                 	-value=>$answer->{isCorrect},
                 	-label=>WebGUI::International::get(20,'Asset_Survey')
+                	-hoverHelp=>WebGUI::International::get('20 description','Asset_Survey')
                 	);
 	} else {
 		$f->hidden("isCorrect",0);
@@ -731,6 +733,7 @@ sub www_editAnswer {
 			-options=>$question,
 			-value=>[$answer->{gotoQuestion}],
 			-label=>WebGUI::International::get(21,'Asset_Survey')
+			-hoverHelp=>WebGUI::International::get('21 description','Asset_Survey')
 			);
 	}
 	if ($answer->{Survey_answerId} eq "new") {
@@ -745,6 +748,7 @@ sub www_editAnswer {
                 $f->whatNext(
                         -options=>\%options,
                         -value=>"addAnswer"
+			-hoverHelp=>WebGUI::International::get('what next answer description','Asset_Survey')
                         );
         }
         $f->submit;
diff --git a/lib/WebGUI/Help/Asset_Survey.pm b/lib/WebGUI/Help/Asset_Survey.pm
index 21bd6f366..0260fca74 100644
--- a/lib/WebGUI/Help/Asset_Survey.pm
+++ b/lib/WebGUI/Help/Asset_Survey.pm
@@ -84,6 +84,10 @@ our $HELP = {
 				tag => 'question add/edit',
 				namespace => 'Asset_Survey'
 			},
+			{
+				tag => 'answer add/edit',
+				namespace => 'Asset_Survey'
+			},
 			{
 				tag => 'survey template',
 				namespace => 'Asset_Survey'
@@ -141,6 +145,41 @@ our $HELP = {
 				tag => 'survey add/edit',
 				namespace => 'Asset_Survey'
 			},
+			{
+				tag => 'answer add/edit',
+				namespace => 'Asset_Survey'
+			},
+		]
+	},
+	'answer add/edit' => {
+		title => '18',
+		body => 'answer add/edit body',
+		fields => [
+                        {
+                                title => '19',
+                                description => '19 description',
+                                namespace => 'Asset_Survey',
+                        },
+                        {
+                                title => '20',
+                                description => '20 description',
+                                namespace => 'Asset_Survey',
+                        },
+                        {
+                                title => '21',
+                                description => '21 description',
+                                namespace => 'Asset_Survey',
+                        },
+		],
+		related => [
+			{
+				tag => 'question add/edit',
+				namespace => 'Asset_Survey'
+			},
+			{
+				tag => 'survey add/edit',
+				namespace => 'Asset_Survey'
+			},
 		]
 	},
 	'survey template' => {
diff --git a/lib/WebGUI/i18n/English/Asset_Survey.pm b/lib/WebGUI/i18n/English/Asset_Survey.pm
index 8510c9998..c3cc1e8fb 100644
--- a/lib/WebGUI/i18n/English/Asset_Survey.pm
+++ b/lib/WebGUI/i18n/English/Asset_Survey.pm
@@ -1124,10 +1124,33 @@ is set to "response".
 <li>Text</il>
 <li>Frequency</il>
 <li>Opinion</il>
+<li>Or you may return to the survey</li>
 </ul>
-or you may return to the survey.
 </p>|,
-                lastUpdated => 1119851108,
+                lastUpdated => 1119982880,
+        },
+
+	'answer add/edit body' => {
+                message => q||,
+                lastUpdated => 1119993979,
+	},
+
+        '19 description' => {
+                message => q|The answer to this question.|,
+                lastUpdated => 1119993924,
+        },
+
+        '20 description' => {
+                message => q|If you have set the Survey to Quiz mode, then you can define if this answer
+is correct or not.|,
+                lastUpdated => 1119993924,
+        },
+
+        'what next answer description' => {
+                message => q|After defining the answer, you can add an answer to this question, addi
+		another question, edit the current question or go back to the page containing the
+		Survey|,
+                lastUpdated => 1119993846,
         },
 
 };