Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml
===================================================================
diff -u -r501ddb69e1c739b90388262f41b4927356cb0449 -r138a8368bb147b0fb478c02a5a9f4a6fb326b51b
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml	(.../QaUsrResp.hbm.xml)	(revision 501ddb69e1c739b90388262f41b4927356cb0449)
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaUsrResp.hbm.xml	(.../QaUsrResp.hbm.xml)	(revision 138a8368bb147b0fb478c02a5a9f4a6fb326b51b)
@@ -26,6 +26,14 @@
     </property>
     
     <property
+        name="answerAutosaved"
+        type="java.lang.String"
+        column="answer_autosaved"
+        length="65535"
+    >
+    </property>
+    
+    <property
         name="attemptTime"
         type="java.util.Date"
         column="attempt_time"
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.java
===================================================================
diff -u -rdd4087c8c38ddcf2e97af7fc2dda25a8c948bcf0 -r138a8368bb147b0fb478c02a5a9f4a6fb326b51b
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.java	(.../QaUsrResp.java)	(revision dd4087c8c38ddcf2e97af7fc2dda25a8c948bcf0)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.java	(.../QaUsrResp.java)	(revision 138a8368bb147b0fb478c02a5a9f4a6fb326b51b)
@@ -32,14 +32,13 @@
 import org.lamsfoundation.lams.rating.dto.ItemRatingDTO;
 
 /**
+ * Holds user responses to questions
  * 
- * @author Ozgur Demirtas
- * 
  * QaUsrResp Value Object The value object that maps to our model database
  * table: tl_laqa11_usr_resp The relevant hibernate mapping resides in:
  * QaQueResp.hbm.xml
  * 
- * Holds user responses to questions
+ * @author Ozgur Demirtas
  */
 
 public class QaUsrResp implements Serializable, Comparable {
@@ -49,6 +48,9 @@
 
     /** nullable persistent field */
     private String answer;
+    
+    /** nullable persistent field */
+    private String answerAutosaved;
 
     /** nullable persistent field */
     private Date attemptTime;
@@ -68,19 +70,21 @@
     private ItemRatingDTO itemRatingDto;
 
     /** full constructor */
-    public QaUsrResp(Long responseId, String answer, Date attemptTime, String timezone,
+    public QaUsrResp(Long responseId, String answer, String answerAutosaved, Date attemptTime, String timezone,
 	    QaQueContent qaQuestion, QaQueUsr qaQueUser) {
 	this.responseId = responseId;
 	this.answer = answer;
+	this.answerAutosaved = answerAutosaved;
 	this.attemptTime = attemptTime;
 	this.timezone = timezone;
 	this.qaQuestion = qaQuestion;
 	this.qaQueUser = qaQueUser;
     }
 
-    public QaUsrResp(String answer, Date attemptTime, String timezone, QaQueContent qaQuestion,
+    public QaUsrResp(String answer, String answerAutosaved, Date attemptTime, String timezone, QaQueContent qaQuestion,
 	    QaQueUsr qaQueUser, boolean visible) {
 	this.answer = answer;
+	this.answerAutosaved = answerAutosaved;
 	this.attemptTime = attemptTime;
 	this.timezone = timezone;
 	this.qaQuestion = qaQuestion;
@@ -101,8 +105,8 @@
      * @return the new qa user response cloned from original object
      */
     public static QaUsrResp newInstance(QaUsrResp response) {
-	return new QaUsrResp(response.getResponseId(), response.getAnswer(), response
-		.getAttemptTime(), response.getTimezone(), response.getQaQuestion(), response.qaQueUser);
+	return new QaUsrResp(response.getResponseId(), response.getAnswer(), response.getAnswerAutosaved(),
+		response.getAttemptTime(), response.getTimezone(), response.getQaQuestion(), response.qaQueUser);
     }
 
     public String toString() {
@@ -135,8 +139,23 @@
     public void setAnswer(String answer) {
 	this.answer = answer;
     }
+    
+    /**
+     * @return Returns the answerAutosaved.
+     */
+    public String getAnswerAutosaved() {
+	return answerAutosaved;
+    }
 
     /**
+     * @param answerAutosaved
+     *                The answerAutosaved to set.
+     */
+    public void setAnswerAutosaved(String answerAutosaved) {
+	this.answerAutosaved = answerAutosaved;
+    }
+
+    /**
      * @return Returns the attemptTime.
      */
     public Date getAttemptTime() {
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20160325.sql
===================================================================
diff -u
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20160325.sql	(revision 0)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20160325.sql	(revision 138a8368bb147b0fb478c02a5a9f4a6fb326b51b)
@@ -0,0 +1,14 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+----------------------Put all sql statements below here-------------------------
+
+--  LDEV-3730 while re-editing a question autosaves overwrite submitted reponse
+ALTER TABLE tl_laqa11_usr_resp ADD COLUMN answer_autosaved TEXT;
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java
===================================================================
diff -u -r8c5b90b876d68d60183b78b5f5edb681a942cfa9 -r138a8368bb147b0fb478c02a5a9f4a6fb326b51b
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java	(.../IQaService.java)	(revision 8c5b90b876d68d60183b78b5f5edb681a942cfa9)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java	(.../IQaService.java)	(revision 138a8368bb147b0fb478c02a5a9f4a6fb326b51b)
@@ -118,8 +118,9 @@
      * @param newAnswer
      * @param toolSessionID
      * @param questionDisplayOrder
+     * @param isAutosave whether it's requested by autosave feature
      */
-    void updateResponseWithNewAnswer(String newAnswer, String toolSessionID, Long questionDisplayOrder);
+    void updateResponseWithNewAnswer(String newAnswer, String toolSessionID, Long questionDisplayOrder, boolean isAutosave);
 
     void createQuestion(QaQueContent qaQuestion);
 
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
===================================================================
diff -u -rd8f165b7033dddd3305170aab255f0a07f959575 -r138a8368bb147b0fb478c02a5a9f4a6fb326b51b
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	(.../QaServicePOJO.java)	(revision d8f165b7033dddd3305170aab255f0a07f959575)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	(.../QaServicePOJO.java)	(revision 138a8368bb147b0fb478c02a5a9f4a6fb326b51b)
@@ -199,8 +199,8 @@
 
 	    // if response doesn't exist
 	    if (response == null) {
-		response = new QaUsrResp(leaderResponse.getAnswer(), leaderResponse.getAttemptTime(), "", question,
-			user, true);
+		response = new QaUsrResp(leaderResponse.getAnswer(), leaderResponse.getAnswerAutosaved(),
+			leaderResponse.getAttemptTime(), "", question, user, true);
 		createUserResponse(response);
 
 		// if it's been changed by the leader
@@ -326,7 +326,7 @@
     }
 
     @Override
-    public void updateResponseWithNewAnswer(String newAnswer, String toolSessionID, Long questionDisplayOrder) {
+    public void updateResponseWithNewAnswer(String newAnswer, String toolSessionID, Long questionDisplayOrder, boolean isAutosave) {
 	HttpSession ss = SessionManager.getSession();
 	UserDTO toolUser = (UserDTO) ss.getAttribute(AttributeNames.USER);
 	Long userId = new Long(toolUser.getUserID().longValue());
@@ -340,12 +340,20 @@
 	QaUsrResp response = getResponseByUserAndQuestion(user.getQueUsrId(), question.getUid());
 	// if response doesn't exist
 	if (response == null) {
-	    response = new QaUsrResp(newAnswer, new Date(System.currentTimeMillis()), "", question, user, true);
+	    response = isAutosave
+		    ? new QaUsrResp(null, newAnswer, new Date(System.currentTimeMillis()), "", question, user, true)
+		    : new QaUsrResp(newAnswer, null, new Date(System.currentTimeMillis()), "", question, user, true);	    
 	    createUserResponse(response);
 
-	    // if answer has changed
+	// if answer has changed
 	} else if (!newAnswer.equals(response.getAnswer())) {
-	    response.setAnswer(newAnswer);
+	    if (isAutosave) {
+		response.setAnswerAutosaved(newAnswer);
+	    } else {
+		response.setAnswer(newAnswer);
+		response.setAnswerAutosaved(null);
+	    }
+	    
 	    response.setAttemptTime(new Date(System.currentTimeMillis()));
 	    response.setTimezone("");
 	    updateUserResponse(response);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java
===================================================================
diff -u -rdd4087c8c38ddcf2e97af7fc2dda25a8c948bcf0 -r138a8368bb147b0fb478c02a5a9f4a6fb326b51b
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java	(.../LearningUtil.java)	(revision dd4087c8c38ddcf2e97af7fc2dda25a8c948bcf0)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java	(.../LearningUtil.java)	(revision 138a8368bb147b0fb478c02a5a9f4a6fb326b51b)
@@ -102,7 +102,7 @@
 	    IQaService qaService) {
 	
 	//create mapAnswers
-	Map<String, String> mapAnswers = (Map) sessionMap.get(MAP_ALL_RESULTS_KEY);
+	Map<String, String> mapAnswers = (Map<String, String>) sessionMap.get(MAP_ALL_RESULTS_KEY);
 	if (mapAnswers == null) {
 	    mapAnswers = new TreeMap<String, String>(new QaComparator());
 	    
@@ -111,7 +111,15 @@
 	    for (QaQueContent question : qaContent.getQaQueContents()) {
 		Long questionUid = question.getUid();
 		QaUsrResp response = qaService.getResponseByUserAndQuestion(user.getQueUsrId(), questionUid);
-		String answer = (response == null) ? null : response.getAnswer();
+		
+		String answer;
+		if (response == null) {
+		    answer = null;
+		} else if (!user.isResponseFinalized() && response.getAnswerAutosaved() != null) {
+		    answer = response.getAnswerAutosaved();
+		} else {
+		    answer = response.getAnswer();
+		}
 		mapAnswersFromDb.put(String.valueOf(question.getDisplayOrder()), answer);
 	    }	    
 	    
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java
===================================================================
diff -u -r596674554dfa059875f580b481de92dfce9e1828 -r138a8368bb147b0fb478c02a5a9f4a6fb326b51b
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	(.../QaLearningAction.java)	(revision 596674554dfa059875f580b481de92dfce9e1828)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	(.../QaLearningAction.java)	(revision 138a8368bb147b0fb478c02a5a9f4a6fb326b51b)
@@ -164,7 +164,7 @@
 		// store
 		if (errors.isEmpty()) {
 		    QaLearningAction.qaService.updateResponseWithNewAnswer(answer, toolSessionID, new Long(
-			    questionIndex));
+			    questionIndex), false);
 		}
 	    }
 
@@ -267,7 +267,7 @@
 	    for (int questionIndex = QaAppConstants.INITIAL_QUESTION_COUNT.intValue(); questionIndex <= intTotalQuestionCount; questionIndex++) {
 		String newAnswer = request.getParameter("answer" + questionIndex);
 		QaLearningAction.qaService.updateResponseWithNewAnswer(newAnswer, toolSessionID,
-			new Long(questionIndex));
+			new Long(questionIndex), true);
 	    }
 
 	} else {
@@ -279,7 +279,7 @@
 	    boolean isRequiredQuestionMissed = currentQuestion.isRequired() && isEmpty(newAnswer);
 	    if (!isRequiredQuestionMissed) {
 		QaLearningAction.qaService.updateResponseWithNewAnswer(newAnswer, toolSessionID, new Long(
-			currentQuestionIndex));
+			currentQuestionIndex), true);
 	    }
 	}
 	return null;
@@ -326,15 +326,15 @@
 	generalLearnerFlowDTO.setRemainingQuestionCount(new Integer(mapQuestions.size()).toString());
 	qaLearningForm.setTotalQuestionCount(new Integer(mapQuestions.size()).toString());
 
-	// populate answers
+	//in order to track whether redo button is pressed store this info
 	QaQueUsr qaQueUsr = getCurrentUser(toolSessionID);
+	qaQueUsr.setResponseFinalized(false);
+	QaLearningAction.qaService.updateUser(qaQueUsr);
+	
+	// populate answers
 	LearningUtil.populateAnswers(sessionMap, qaContent, qaQueUsr, mapQuestions, generalLearnerFlowDTO,
 		QaLearningAction.qaService);
 	
-	//in order to track whether redo button is pressed store this info
-	qaQueUsr.setResponseFinalized(false);
-	QaLearningAction.qaService.updateUser(qaQueUsr);
-
 	request.setAttribute(QaAppConstants.GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
 	qaLearningForm.resetAll();
 	return (mapping.findForward(QaAppConstants.LOAD_LEARNER));
@@ -577,11 +577,11 @@
 
 	Map<String, String> mapAnswers = (Map<String, String>) sessionMap.get(QaAppConstants.MAP_ALL_RESULTS_KEY);
 	if (mapAnswers == null) {
-	    mapAnswers = new TreeMap(new QaComparator());
+	    mapAnswers = new TreeMap<String, String>(new QaComparator());
 	}
 
 	String newAnswer = qaLearningForm.getAnswer();
-	Map mapSequentialAnswers = (Map) sessionMap.get(QaAppConstants.MAP_SEQUENTIAL_ANSWERS_KEY);
+	Map<String, String> mapSequentialAnswers = (Map<String, String>) sessionMap.get(QaAppConstants.MAP_SEQUENTIAL_ANSWERS_KEY);
 	if (mapSequentialAnswers.size() >= new Integer(currentQuestionIndex).intValue()) {
 	    mapSequentialAnswers.remove(new Long(currentQuestionIndex).toString());
 	}
@@ -599,18 +599,12 @@
 	// store
 	if (errors.isEmpty()) {
 	    QaLearningAction.qaService.updateResponseWithNewAnswer(newAnswer, qaLearningForm.getToolSessionID(),
-		    new Long(currentQuestionIndex));
+		    new Long(currentQuestionIndex), false);
 	} else {
 	    saveErrors(request, errors);
 	    nextQuestionOffset = 0;
 	}
 
-	sessionMap.put(QaAppConstants.MAP_ALL_RESULTS_KEY, mapAnswers);
-	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
-	qaLearningForm.setHttpSessionID(sessionMap.getSessionID());
-	generalLearnerFlowDTO.setHttpSessionID(sessionMap.getSessionID());
-	request.setAttribute(QaAppConstants.GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
-
 	int intCurrentQuestionIndex = new Integer(currentQuestionIndex).intValue() + nextQuestionOffset;
 	String currentAnswer = "";
 	if (mapAnswers.size() >= intCurrentQuestionIndex) {
@@ -631,11 +625,11 @@
 	    userFeedback = "End of the questions.";
 	}
 	generalLearnerFlowDTO.setUserFeedback(userFeedback);
-	
 	generalLearnerFlowDTO.setRemainingQuestionCount("" + remainingQuestionCount);
 
 	qaLearningForm.resetUserActions(); /*resets all except submitAnswersContent */
 
+	sessionMap.put(QaAppConstants.MAP_ALL_RESULTS_KEY, mapAnswers);
 	sessionMap.put(QaAppConstants.MAP_SEQUENTIAL_ANSWERS_KEY, mapSequentialAnswers);
 	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
 	qaLearningForm.setHttpSessionID(sessionMap.getSessionID());