Index: samigo-app/src/webapp/jsf/delivery/item/deliverShortAnswer.jsp
===================================================================
--- samigo-app/src/webapp/jsf/delivery/item/deliverShortAnswer.jsp	(revision 3381)
+++ samigo-app/src/webapp/jsf/delivery/item/deliverShortAnswer.jsp	(working copy)
@@ -52,10 +52,17 @@
             && delivery.actionString!='gradeAssessment' && !delivery.studentRichText}">
 	<f:validateLength maximum="60000"/>
 </h:inputTextarea>
-<h:outputText value="#{question.responseTextForDisplay}" 
-   rendered="#{delivery.actionString=='reviewAssessment'
-            || delivery.actionString=='gradeAssessment'}" escape="false"/>
 
+<%-- Indent and label student response --%>
+<h:panelGrid columns="1" border="0" 
+	rendered="#{delivery.actionString=='reviewAssessment'
+		            || delivery.actionString=='gradeAssessment'}">
+	<h:outputText style="font-style:italic; margin-left:25px;" value="#{deliveryMessages.student_response}" />
+	<h:panelGrid columns="1" cellpadding="4" style="border-style:solid; border-width: 1px; margin-left:25px;">
+		<h:outputText value="#{question.responseTextForDisplay}"/>
+	</h:panelGrid>
+</h:panelGrid>
+
 <f:verbatim><br /></f:verbatim>
 <h:panelGroup rendered="#{(delivery.actionString=='previewAssessment'
                 || delivery.actionString=='takeAssessment' 
Index: samigo-app/src/webapp/jsf/delivery/item/deliverShortAnswerLink.jsp
===================================================================
--- samigo-app/src/webapp/jsf/delivery/item/deliverShortAnswerLink.jsp	(revision 3381)
+++ samigo-app/src/webapp/jsf/delivery/item/deliverShortAnswerLink.jsp	(working copy)
@@ -52,11 +52,25 @@
             && delivery.actionString!='gradeAssessment' && !delivery.studentRichText}">
 <f:validateLength maximum="60000"/>
 </h:inputTextarea>
-<h:outputText value="#{question.responseTextForDisplay}" 
-   rendered="#{delivery.actionString=='reviewAssessment'
-            || delivery.actionString=='gradeAssessment'}" escape="false"/>
 
+<%-- Otherwise, show old-style non-rich text answer input --%>
 
+<h:inputTextarea rows="20" cols="80" value="#{question.responseText}" 
+   rendered="#{delivery.actionString!='reviewAssessment'
+            && delivery.actionString!='gradeAssessment' && !delivery.studentRichText}">
+	<f:validateLength maximum="60000"/>
+</h:inputTextarea>
+
+<%-- Indent and label student response --%>
+<h:panelGrid columns="1" border="0" 
+	rendered="#{delivery.actionString=='reviewAssessment'
+		            || delivery.actionString=='gradeAssessment'}">
+	<h:outputText style="font-style:italic; margin-left:25px;" value="#{deliveryMessages.student_response}" />
+	<h:panelGrid columns="1" cellpadding="4" style="border-style:solid; border-width: 1px; margin-left:25px;">
+		<h:outputText value="#{question.responseTextForDisplay}"/>
+	</h:panelGrid>
+</h:panelGrid>
+
 <f:verbatim><br /></f:verbatim>
 <h:selectBooleanCheckbox value="#{question.review}" id="mark_for_review"
    rendered="#{(delivery.actionString=='previewAssessment'