Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -rc6d1e011ff92ac2a8b0581efa0982100101c70b7 -r0dbc1d60bc9b43c26c431c9a2e15981ca0863d46
Binary files differ
Index: lams_central/src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java
===================================================================
diff -u -rf78211d8d91db7e763371407f0ea29973542b5c2 -r0dbc1d60bc9b43c26c431c9a2e15981ca0863d46
--- lams_central/src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java	(.../LAMSUploadServlet.java)	(revision f78211d8d91db7e763371407f0ea29973542b5c2)
+++ lams_central/src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java	(.../LAMSUploadServlet.java)	(revision 0dbc1d60bc9b43c26c431c9a2e15981ca0863d46)
@@ -23,10 +23,7 @@
 import org.apache.commons.fileupload.DiskFileUpload;
 import org.apache.commons.fileupload.FileItem;
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
-import org.lamsfoundation.lams.util.Configuration;
-import org.lamsfoundation.lams.util.ConfigurationKeys;
-import org.lamsfoundation.lams.util.FileUtil;
+import org.lamsfoundation.lams.util.UploadFileUtil;
 
 /**
  * Servlet to upload files.<br>
@@ -43,9 +40,6 @@
  * @author Mitchell Seaton
  * 
  * @web:servlet name="SimpleUploader" load-on-startup = "1"
- * @web.servlet-init-param name = "baseDir" value = "secure"
- * @web.servlet-init-param name = "debug" value = "true"
- * @web.servlet-init-param name = "enabled" value = "true"
  * @web.servlet-init-param name = "AllowedExtensionsFile" value = ""
  * @web.servlet-init-param name = "DeniedExtensionsFile" value =
  *                         "php|php3|php5|phtml|asp|aspx|ascx|jsp|cfm|cfc|pl|bat|exe|dll|reg|cg"
@@ -58,18 +52,11 @@
  */
 
 public class LAMSUploadServlet extends HttpServlet {
-
     private static final Logger log = Logger.getLogger(LAMSUploadServlet.class);
 
-    private static String baseDir;
-    private static boolean debug = false;
-    private static boolean enabled = false;
     private static Hashtable<String, ArrayList<String>> allowedExtensions;
     private static Hashtable<String, ArrayList<String>> deniedExtensions;
 
-    private String realBaseDir;
-    private String lamsContextPath;
-
     /**
      * Initialize the servlet.<br>
      * Retrieve from the servlet configuration the "baseDir" which is the root of the file repository:<br>
@@ -79,28 +66,10 @@
      */
     @Override
     public void init() throws ServletException {
-
-	LAMSUploadServlet.debug = (new Boolean(getInitParameter("debug"))).booleanValue()
-		&& LAMSUploadServlet.log.isDebugEnabled();
-
-	if (LAMSUploadServlet.debug) {
+	if (LAMSUploadServlet.log.isDebugEnabled()) {
 	    LAMSUploadServlet.log.debug("Initialization started");
 	}
 
-	LAMSUploadServlet.baseDir = getInitParameter("baseDir");
-	LAMSUploadServlet.enabled = (new Boolean(getInitParameter("enabled"))).booleanValue();
-
-	if (LAMSUploadServlet.baseDir == null) {
-	    LAMSUploadServlet.baseDir = "secure";
-	}
-
-	getConfigKeyValues();
-
-	File baseFile = new File(realBaseDir);
-	if (!baseFile.exists()) {
-	    baseFile.mkdir();
-	}
-
 	LAMSUploadServlet.allowedExtensions = new Hashtable<String, ArrayList<String>>(3);
 	LAMSUploadServlet.deniedExtensions = new Hashtable<String, ArrayList<String>>(3);
 
@@ -113,7 +82,7 @@
 	LAMSUploadServlet.allowedExtensions.put("Flash", stringToArrayList(getInitParameter("AllowedExtensionsFlash")));
 	LAMSUploadServlet.deniedExtensions.put("Flash", stringToArrayList(getInitParameter("DeniedExtensionsFlash")));
 
-	if (LAMSUploadServlet.debug) {
+	if (LAMSUploadServlet.log.isDebugEnabled()) {
 	    LAMSUploadServlet.log.debug("Initialization completed");
 	}
     }
@@ -128,9 +97,10 @@
      * javascript command in it.
      * 
      */
+    @SuppressWarnings("unchecked")
     @Override
     public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-	if (LAMSUploadServlet.debug) {
+	if (LAMSUploadServlet.log.isDebugEnabled()) {
 	    LAMSUploadServlet.log.debug("Upload started");
 	}
 
@@ -144,83 +114,52 @@
 	    returnMessage = "Security error. You probably don't have enough permissions to upload. Please check your server.";
 	} else {
 	    // get realBaseDir and lamsContextPath at request time from config values in memory
-	    getConfigKeyValues();
 	    String typeStr = request.getParameter("Type");
 
-	    // create content directory if non-existant
-	    String currentDirPath = realBaseDir + currentFolderStr;
-	    String validCurrentDirPath = currentDirPath.replace('/', File.separatorChar);
-	    String currentWebPath = lamsContextPath + AuthoringConstants.LAMS_WWW_FOLDER + FileUtil.LAMS_WWW_SECURE_DIR
-		    + currentFolderStr + typeStr;
+	    DiskFileUpload upload = new DiskFileUpload();
+	    try {
+		List<FileItem> items = upload.parseRequest(request);
+		Map<String, Object> fields = new HashMap<String, Object>();
 
-	    File currentContentDir = new File(validCurrentDirPath);
-	    if (!currentContentDir.exists()) {
-		currentContentDir.mkdir();
-	    }
+		Iterator<FileItem> iter = items.iterator();
+		while (iter.hasNext()) {
+		    FileItem item = iter.next();
+		    if (item.isFormField()) {
+			fields.put(item.getFieldName(), item.getString());
+		    } else {
+			fields.put(item.getFieldName(), item);
+		    }
+		}
+		FileItem uplFile = (FileItem) fields.get("NewFile");
+		if (uplFile == null) {
+		    // form field name used by CKEditor 3.x
+		    uplFile = (FileItem) fields.get("upload");
+		}
 
-	    // create content type directory if non-existant
-	    validCurrentDirPath += typeStr;
+		String fileNameLong = uplFile.getName();
+		fileNameLong = fileNameLong.replace('\\', '/');
+		String[] pathParts = fileNameLong.split("/");
+		String fileName = pathParts[pathParts.length - 1];
+		String ext = UploadFileUtil.getFileExtension(fileName);
 
-	    File currentDir = new File(validCurrentDirPath);
-	    if (!currentDir.exists()) {
-		currentDir.mkdir();
-	    }
+		if (extIsAllowed(typeStr, ext)) {
+		    File uploadDir = UploadFileUtil.getUploadDir(currentFolderStr, typeStr);
+		    fileName = UploadFileUtil.getUploadFileName(uploadDir, fileName);
+		    File destinationFile = new File(uploadDir, fileName);
 
-	    if (LAMSUploadServlet.debug) {
-		LAMSUploadServlet.log.debug(currentDirPath);
-	    }
+		    String currentWebPath = UploadFileUtil.getUploadWebPath(currentFolderStr, typeStr);
+		    fileUrl = currentWebPath + '/' + fileName;
 
-	    if (LAMSUploadServlet.enabled) {
-		DiskFileUpload upload = new DiskFileUpload();
-		try {
-		    List<FileItem> items = upload.parseRequest(request);
-
-		    Map fields = new HashMap();
-
-		    Iterator<FileItem> iter = items.iterator();
-		    while (iter.hasNext()) {
-			FileItem item = iter.next();
-			if (item.isFormField()) {
-			    fields.put(item.getFieldName(), item.getString());
-			} else {
-			    fields.put(item.getFieldName(), item);
-			}
+		    uplFile.write(destinationFile);
+		    if (LAMSUploadServlet.log.isDebugEnabled()) {
+			LAMSUploadServlet.log.debug("Uploaded file to " + destinationFile.getAbsolutePath());
 		    }
-		    FileItem uplFile = (FileItem) fields.get("NewFile");
-		    if (uplFile == null) {
-			// form field name used by CKEditor 3.x
-			uplFile = (FileItem) fields.get("upload");
-		    }
-		    String fileNameLong = uplFile.getName();
-		    fileNameLong = fileNameLong.replace('\\', '/');
-		    String[] pathParts = fileNameLong.split("/");
-		    String fileName = pathParts[pathParts.length - 1];
-
-		    String nameWithoutExt = LAMSUploadServlet.getNameWithoutExtension(fileName);
-		    String ext = getExtension(fileName);
-		    File pathToSave = new File(validCurrentDirPath, fileName);
-		    fileUrl = currentWebPath + '/' + fileName;
-		    if (extIsAllowed(typeStr, ext)) {
-			int counter = 1;
-			newName = fileName;
-			while (pathToSave.exists()) {
-			    newName = nameWithoutExt + "_" + counter + "." + ext;
-			    fileUrl = currentWebPath + '/' + newName;
-			    returnMessage = "A file with the same name is already available. The uploaded file has been renamed to: "
-				    + newName;
-			    pathToSave = new File(validCurrentDirPath, newName);
-			    counter++;
-			}
-			uplFile.write(pathToSave);
-		    } else {
-			returnMessage = "Invalid file type";
-		    }
-		} catch (Exception e) {
-		    LAMSUploadServlet.log.error(e);
-		    returnMessage = "Error while uploading file";
+		} else {
+		    returnMessage = "Invalid file type";
 		}
-	    } else {
-		returnMessage = "This file uploader is disabled. Please check the WEB-INF/web.xml file";
+	    } catch (Exception e) {
+		LAMSUploadServlet.log.error(e);
+		returnMessage = "Error while uploading file";
 	    }
 	}
 
@@ -241,46 +180,31 @@
 	    out.println("</script>");
 	    out.flush();
 	    out.close();
-	} else if (LAMSUploadServlet.debug) {
+	} else if (LAMSUploadServlet.log.isDebugEnabled()) {
 	    LAMSUploadServlet.log
 		    .debug("No CKEditor method found to run after completion, but upload finished with message: "
 			    + returnMessage);
 	}
 
-	if (LAMSUploadServlet.debug) {
+	if (LAMSUploadServlet.log.isDebugEnabled()) {
 	    LAMSUploadServlet.log.debug("Upload finished");
 	}
     }
 
-    /*
-     * This method was fixed after Kris Barnhoorn (kurioskronic) submitted SF bug #991489
-     */
-    private static String getNameWithoutExtension(String fileName) {
-	return fileName.substring(0, fileName.lastIndexOf("."));
-    }
-
-    /*
-     * This method was fixed after Kris Barnhoorn (kurioskronic) submitted SF bug #991489
-     */
-    private String getExtension(String fileName) {
-	return fileName.substring(fileName.lastIndexOf(".") + 1);
-    }
-
     /**
      * Helper function to convert the configuration string to an ArrayList.
      */
 
     private ArrayList<String> stringToArrayList(String str) {
-
-	if (LAMSUploadServlet.debug) {
+	if (LAMSUploadServlet.log.isDebugEnabled()) {
 	    LAMSUploadServlet.log.debug(str);
 	}
 	String[] strArr = str.split("\\|");
 
 	ArrayList<String> tmp = new ArrayList<String>();
 	if (str.length() > 0) {
 	    for (int i = 0; i < strArr.length; ++i) {
-		if (LAMSUploadServlet.debug) {
+		if (LAMSUploadServlet.log.isDebugEnabled()) {
 		    LAMSUploadServlet.log.debug(i + " - " + strArr[i]);
 		}
 		tmp.add(strArr[i].toLowerCase());
@@ -294,7 +218,6 @@
      */
 
     private boolean extIsAllowed(String fileType, String ext) {
-
 	String extLower = ext.toLowerCase();
 
 	ArrayList<String> allowList = LAMSUploadServlet.allowedExtensions.get(fileType);
@@ -310,10 +233,4 @@
 
 	return false;
     }
-
-    private void getConfigKeyValues() {
-	realBaseDir = Configuration.get(ConfigurationKeys.LAMS_EAR_DIR) + File.separator + FileUtil.LAMS_WWW_DIR
-		+ File.separator + LAMSUploadServlet.baseDir;
-	lamsContextPath = "/" + Configuration.get(ConfigurationKeys.SERVER_URL_CONTEXT_PATH) + "/";
-    }
 }
\ No newline at end of file
Index: lams_central/src/java/org/lamsfoundation/lams/web/QuestionsAction.java
===================================================================
diff -u -rc6d1e011ff92ac2a8b0581efa0982100101c70b7 -r0dbc1d60bc9b43c26c431c9a2e15981ca0863d46
--- lams_central/src/java/org/lamsfoundation/lams/web/QuestionsAction.java	(.../QuestionsAction.java)	(revision c6d1e011ff92ac2a8b0581efa0982100101c70b7)
+++ lams_central/src/java/org/lamsfoundation/lams/web/QuestionsAction.java	(.../QuestionsAction.java)	(revision 0dbc1d60bc9b43c26c431c9a2e15981ca0863d46)
@@ -76,9 +76,8 @@
 	    Collections.addAll(limitType, limitTypeParam.split(","));
 	}
 
-	Question[] questions = packageName.endsWith(".xml") ? QuestionParser
-		.parseQTIFile(uploadedFileStream, limitType) : QuestionParser.parseQTIPackage(uploadedFileStream,
-		limitType);
+	Question[] questions = packageName.endsWith(".xml") ? QuestionParser.parseQTIFile(uploadedFileStream, null,
+		limitType) : QuestionParser.parseQTIPackage(uploadedFileStream, limitType);
 	request.setAttribute("questions", questions);
 
 	return mapping.findForward("questionChoice");
Index: lams_central/web/questionChoice.jsp
===================================================================
diff -u -ra43256ee6435f1cd14f46c235e4d507957a86a5b -r0dbc1d60bc9b43c26c431c9a2e15981ca0863d46
--- lams_central/web/questionChoice.jsp	(.../questionChoice.jsp)	(revision a43256ee6435f1cd14f46c235e4d507957a86a5b)
+++ lams_central/web/questionChoice.jsp	(.../questionChoice.jsp)	(revision 0dbc1d60bc9b43c26c431c9a2e15981ca0863d46)
@@ -23,6 +23,7 @@
 		
 		.questionText {
 			margin-left: 43px;
+			overflow: auto;
 		}
 		
 		div.answerDiv input {
@@ -88,6 +89,7 @@
 					answerDiv.toggle('slow');
 				}
 				$('input', answerDiv).add(selector + 'feedback').add(selector + 'type').add(selector + 'text')
+				                     .add(selector + 'resourcesFolder')
 				                     .attr('disabled', checked ? null : 'disabled');
 				
 				if (checked) {
@@ -161,18 +163,23 @@
 					(<fmt:message key="label.questions.choice.type.unknown" />)
 				</c:otherwise>
 			</c:choose>
-			<c:out value='${question.title}' /><br />
+			<c:out value='${question.title}' />
 			<input id="question${questionStatus.index}text" name="question${questionStatus.index}text"
 			       value="<c:out value='${question.text}' />"
 			       class="questionAttribute" type="hidden" disabled="disabled" />
-			       <span class="questionText"><c:out value='${question.text}' /></span><br />
+			       <div class="questionText">${question.text}</div><br />
 			<input type="hidden" id="question${questionStatus.index}type" name="question${questionStatus.index}type"
 		           value="${question.type}"
 		           class="questionAttribute" disabled="disabled" />
 			<%-- Question feedback --%>
 		    <input type="hidden" id="question${questionStatus.index}feedback" name="question${questionStatus.index}feedback"
-		           value="${question.feedback}"
+		           value="<c:out value='${question.feedback}' />"
 		           class="questionAttribute" disabled="disabled" />
+		    <%-- If question contains images, where to take them from --%>
+		    <input type="hidden" id="question${questionStatus.index}resourcesFolder"
+		           name="question${questionStatus.index}resourcesFolder"
+		           value="<c:out value='${question.resourcesFolderPath}' />"
+		           class="questionAttribute" disabled="disabled" />
 		    <%-- Answers, if required and exist --%>
 			<c:if test="${fn:length(question.answers) > 0}">
 				<div id="question${questionStatus.index}answerDiv" class="answerDiv">
@@ -184,7 +191,7 @@
 							<c:when test="${question.type eq 'mc' or question.type eq 'mr' or question.type eq 'fb'}">
 								<input name="question${questionStatus.index}answer${answerStatus.index}"
 					       			   value="<c:out value='${answer.text}' />"
-					       			   type="checkbox" checked="checked" disabled="disabled" /><c:out value='${answer.text}' /><br />
+					       			   type="checkbox" checked="checked" disabled="disabled" />${answer.text}<br />
 			       			</c:when>
 			       			<c:otherwise>
 			       				<%-- Do not display answers if management is too difficult or pointless --%>
@@ -197,7 +204,7 @@
 			       		<input type="hidden" name="question${questionStatus.index}answer${answerStatus.index}score"
 						       value="${answer.score}" disabled="disabled" />
 						<input type="hidden" name="question${questionStatus.index}answer${answerStatus.index}feedback"
-		           			   value="${answer.feedback}" disabled="disabled" />
+		           			   value="<c:out value='${answer.feedback}' />" disabled="disabled" />
 					</c:forEach>
 					<c:if test="${question.type eq 'mt'}">
 						<input type="hidden" name="matchAnswerCount${questionStatus.index}" 
Index: lams_common/src/java/org/lamsfoundation/lams/questions/Question.java
===================================================================
diff -u -ra43256ee6435f1cd14f46c235e4d507957a86a5b -r0dbc1d60bc9b43c26c431c9a2e15981ca0863d46
--- lams_common/src/java/org/lamsfoundation/lams/questions/Question.java	(.../Question.java)	(revision a43256ee6435f1cd14f46c235e4d507957a86a5b)
+++ lams_common/src/java/org/lamsfoundation/lams/questions/Question.java	(.../Question.java)	(revision 0dbc1d60bc9b43c26c431c9a2e15981ca0863d46)
@@ -50,6 +50,7 @@
     private List<Answer> answers;
     private List<Answer> matchAnswers;
     private Map<Integer, Integer> matchMap;
+    private String resourcesFolderPath;
 
     public String getType() {
 	return type;
@@ -60,11 +61,11 @@
     }
 
     public String getTitle() {
-        return title;
+	return title;
     }
 
     public void setTitle(String title) {
-        this.title = title;
+	this.title = title;
     }
 
     public String getText() {
@@ -107,6 +108,14 @@
 	this.matchMap = matchMap;
     }
 
+    public String getResourcesFolderPath() {
+	return resourcesFolderPath;
+    }
+
+    public void setResourcesFolderPath(String resourcesFolderPath) {
+	this.resourcesFolderPath = resourcesFolderPath;
+    }
+
     @Override
     public int hashCode() {
 	return new HashCodeBuilder().append(text).toHashCode();
Index: lams_common/src/java/org/lamsfoundation/lams/questions/QuestionParser.java
===================================================================
diff -u -rc6d1e011ff92ac2a8b0581efa0982100101c70b7 -r0dbc1d60bc9b43c26c431c9a2e15981ca0863d46
--- lams_common/src/java/org/lamsfoundation/lams/questions/QuestionParser.java	(.../QuestionParser.java)	(revision c6d1e011ff92ac2a8b0581efa0982100101c70b7)
+++ lams_common/src/java/org/lamsfoundation/lams/questions/QuestionParser.java	(.../QuestionParser.java)	(revision 0dbc1d60bc9b43c26c431c9a2e15981ca0863d46)
@@ -36,13 +36,17 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.util.UploadFileUtil;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.util.zipfile.ZipFileUtil;
 import org.lamsfoundation.lams.util.zipfile.ZipFileUtilException;
@@ -69,6 +73,7 @@
     private static final Question[] QUESTION_ARRAY_TYPE = new Question[] {};
     // can be anything
     private static final String TEMP_PACKAGE_NAME_PREFIX = "QTI_PACKAGE_";
+    private static final Pattern IMAGE_PATTERN = Pattern.compile("\\[IMAGE: (.*)\\]");
 
     /**
      * Extracts questions from IMS QTI zip file.
@@ -90,7 +95,7 @@
 		    FileInputStream xmlFileStream = new FileInputStream(resourceFile);
 		    Question[] fileQuestions = null;
 		    try {
-			fileQuestions = QuestionParser.parseQTIFile(xmlFileStream, limitType);
+			fileQuestions = QuestionParser.parseQTIFile(xmlFileStream, tempPackageDirPath, limitType);
 		    } finally {
 			xmlFileStream.close();
 		    }
@@ -102,7 +107,21 @@
 	} finally {
 	    // clean up
 	    packageFileStream.close();
-	    ZipFileUtil.deleteDirectory(tempPackageDirPath);
+
+	    // if there are any images attached, do not delete the exploded ZIP
+	    // unfortunately, in this case it stays there until OS does temp dir clean up
+	    boolean tempFolderStillNeeded = false;
+	    if (result != null) {
+		for (Question question : result) {
+		    if (!StringUtils.isBlank(question.getResourcesFolderPath())) {
+			tempFolderStillNeeded = true;
+			break;
+		    }
+		}
+	    }
+	    if (!tempFolderStillNeeded) {
+		ZipFileUtil.deleteDirectory(tempPackageDirPath);
+	    }
 	}
 
 	return result.toArray(QuestionParser.QUESTION_ARRAY_TYPE);
@@ -111,7 +130,7 @@
     /**
      * Extracts questions from IMS QTI xml file.
      */
-    public static Question[] parseQTIFile(InputStream xmlFileStream, Set<String> limitType)
+    public static Question[] parseQTIFile(InputStream xmlFileStream, String resourcesFolderPath, Set<String> limitType)
 	    throws ParserConfigurationException, SAXException, IOException {
 	List<Question> result = new ArrayList<Question>();
 	DocumentBuilder docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
@@ -144,14 +163,13 @@
 		Node presentationChild = presentationChildrenList.item(presentationChildIndex);
 		// here is where question data is stored
 		if ("material".equals(presentationChild.getNodeName())) {
-		    Element questionElement = (Element) ((Element) presentationChild).getElementsByTagName("mattext")
-			    .item(0);
-		    String questionText = ((CDATASection) questionElement.getChildNodes().item(0)).getData();
+		    String questionText = QuestionParser.parseMaterialElement(presentationChild, question,
+			    resourcesFolderPath);
 		    if (questionText.trim().startsWith("<!--")) {
 			// do not support Algorithmic question type
 			continue questionLoop;
 		    }
-		    question.setText(WebUtil.removeHTMLtags(questionText));
+		    question.setText(questionText);
 		} else if ("response_lid".equals(presentationChild.getNodeName())) {
 		    if (question.getAnswers() == null) {
 			boolean multipleAnswersAllowed = "multiple".equalsIgnoreCase(((Element) presentationChild)
@@ -160,8 +178,9 @@
 			// parse answers
 			for (int answerIndex = 0; answerIndex < answerList.getLength(); answerIndex++) {
 			    Element answerElement = (Element) answerList.item(answerIndex);
-			    Element textElement = (Element) answerElement.getElementsByTagName("mattext").item(0);
-			    String answerText = ((CDATASection) textElement.getChildNodes().item(0)).getData();
+			    Element materialElement = (Element) answerElement.getElementsByTagName("material").item(0);
+			    String answerText = QuestionParser.parseMaterialElement(materialElement, question,
+				    resourcesFolderPath);
 
 			    // if there are answers different thatn true/false,
 			    // it is Multiple Choice or Multiple Answers
@@ -175,7 +194,7 @@
 			    }
 
 			    Answer answer = new Answer();
-			    answer.setText(WebUtil.removeHTMLtags(answerText));
+			    answer.setText(answerText);
 			    if (question.getAnswers() == null) {
 				question.setAnswers(new ArrayList<Answer>());
 			    }
@@ -213,12 +232,11 @@
 			    // parse answers for first part of matching
 			    Node responseLidChild = responseLidChildrenList.item(responseLidChildIndex);
 			    if ("material".equals(responseLidChild.getNodeName())) {
-				Element answerElement = (Element) ((Element) presentationChild).getElementsByTagName(
-					"mattext").item(0);
-				String answerText = ((CDATASection) answerElement.getChildNodes().item(0)).getData();
+				String answerText = QuestionParser.parseMaterialElement(responseLidChild, question,
+					resourcesFolderPath);
 
 				Answer answer = new Answer();
-				answer.setText(WebUtil.removeHTMLtags(answerText));
+				answer.setText(answerText);
 				question.getAnswers().add(answer);
 
 				String answerId = ((Element) presentationChild).getAttribute("ident");
@@ -262,7 +280,7 @@
 			if (textBasedQuestion) {
 			    // for Fill-in-Blank answer parsing can be done only here
 			    answer = new Answer();
-			    answer.setText(WebUtil.removeHTMLtags(answerId));
+			    answer.setText(answerId);
 			    if (question.getAnswers() == null) {
 				question.setAnswers(new ArrayList<Answer>());
 			    }
@@ -314,21 +332,22 @@
 	    NodeList feedbacks = questionItem.getElementsByTagName("itemfeedback");
 	    for (int feedbackIndex = 0; feedbackIndex < feedbacks.getLength(); feedbackIndex++) {
 		Element feedbackElement = (Element) feedbacks.item(feedbackIndex);
-		String feedbackText = ((CDATASection) feedbackElement.getElementsByTagName("mattext").item(0)
-			.getChildNodes().item(0)).getData();
+		Node materialElement = feedbackElement.getElementsByTagName("material").item(0);
+		String feedbackText = QuestionParser.parseMaterialElement(materialElement, question,
+			resourcesFolderPath);
 		if (!StringUtils.isBlank(feedbackText)) {
 		    String feedbackType = feedbackElement.getAttribute("view");
 		    // it is a question feedback
 		    if ("All".equalsIgnoreCase(feedbackType)) {
-			question.setFeedback(WebUtil.removeHTMLtags(feedbackText));
+			question.setFeedback(feedbackText);
 		    } else {
 			// it is an answer feedback
 			String feedbackId = feedbackElement.getAttribute("ident");
 			String answerId = feedbackMap.get(feedbackId);
 			if (answerId != null) {
 			    Answer answer = answerMap.get(answerId);
 			    if (answer != null) {
-				answer.setFeedback(WebUtil.removeHTMLtags(feedbackText));
+				answer.setFeedback(feedbackText);
 			    }
 			}
 		    }
@@ -369,6 +388,12 @@
 		    question.setFeedback(URLDecoder.decode(questionFeedback, "UTF8"));
 		}
 
+		String questionResourcesFolderPath = WebUtil.extractParameterValue(queryString, "question"
+			+ questionIndex + "resourcesFolder");
+		if (!StringUtils.isBlank(questionResourcesFolderPath)) {
+		    question.setResourcesFolderPath(URLDecoder.decode(questionResourcesFolderPath, "UTF8"));
+		}
+
 		boolean isMatching = Question.QUESTION_TYPE_MATCHING.equals(question.getType());
 
 		// extract answers
@@ -438,6 +463,56 @@
     }
 
     /**
+     * Adapts QTI form field for Tools to use. Some Tools do not accept HTML, so it gets converted to plain text. Also
+     * image placeholders get resolved here.
+     */
+    public static String processHTMLField(String fieldText, boolean forcePlainText, String contentFolderID,
+	    String resourcesFolderPath) {
+	String result = forcePlainText ? WebUtil.removeHTMLtags(fieldText) : fieldText;
+
+	if (!StringUtils.isBlank(result)) {
+	    Matcher imageMatcher = QuestionParser.IMAGE_PATTERN.matcher(result);
+	    StringBuffer resultBuilder = new StringBuffer();
+
+	    // find image placeholders
+	    while (imageMatcher.find()) {
+		String fileName = imageMatcher.group(1);
+		// if it is plain text or something goes wrong, the placeholder simply gets removed
+		String replacement = "";
+		if (!forcePlainText) {
+		    if (resourcesFolderPath == null) {
+			QuestionParser.log
+				.warn("Image " + fileName + " declaration found but its location is unknown.");
+		    } else {
+			File sourceFile = new File(resourcesFolderPath, fileName);
+			if (sourceFile.canRead()) {
+			    // copy the image from exploded IMS zip to secure dir in lams-www
+			    File uploadDir = UploadFileUtil.getUploadDir(contentFolderID, "Image");
+			    String destinationFileName = UploadFileUtil.getUploadFileName(uploadDir, fileName);
+			    File destinationFile = new File(uploadDir, destinationFileName);
+			    String uploadWebPath = UploadFileUtil.getUploadWebPath(contentFolderID, "Image") + '/'
+				    + fileName;
+			    try {
+				FileUtils.copyFile(sourceFile, destinationFile);
+				replacement = "<img src=\"" + uploadWebPath + "\" />";
+			    } catch (IOException e) {
+				QuestionParser.log.error("Could not store image " + fileName);
+			    }
+			} else {
+			    QuestionParser.log.warn("Image " + fileName + " declaration found but it can not be read.");
+			}
+		    }
+		}
+		imageMatcher.appendReplacement(resultBuilder, replacement);
+	    }
+	    imageMatcher.appendTail(resultBuilder);
+	    result = resultBuilder.toString();
+	}
+
+	return StringUtils.isBlank(result) ? null : result;
+    }
+
+    /**
      * Find XML file list in IMS QTI package.
      */
     private static List<File> getQTIResourceFiles(String packageDirPath) throws IOException,
@@ -472,10 +547,40 @@
      * Checks if given type has a correct value and should be processed. Also sets question property for convenience.
      */
     private static boolean isQuestionTypeAcceptable(String type, Set<String> limitType, Question question) {
-	if (type == null || !Question.QUESTION_TYPES.contains(type)) {
+	if ((type == null) || !Question.QUESTION_TYPES.contains(type)) {
 	    return false;
 	}
 	question.setType(type);
 	return (limitType == null) || limitType.isEmpty() || limitType.contains(type);
     }
+
+    /**
+     * Constructs HTML text out of "material" IMS QTI tags. Images get replaced by placeholders for further processing.
+     */
+    private static String parseMaterialElement(Node materialElement, Question question, String resourcesFolderPath) {
+	StringBuilder result = new StringBuilder();
+
+	NodeList questionElements = materialElement.getChildNodes();
+	for (int questionElementIndex = 0; questionElementIndex < questionElements.getLength(); questionElementIndex++) {
+	    Node questionElement = questionElements.item(questionElementIndex);
+	    String elementName = questionElement.getNodeName();
+	    if ("mattext".equalsIgnoreCase(elementName)) {
+		// it is a HTML part
+		String questionTextPart = ((CDATASection) questionElement.getChildNodes().item(0)).getData();
+		result.append(questionTextPart);
+	    } else if ("matimage".equalsIgnoreCase(elementName)) {
+		String fileName = ((Element) questionElement).getAttribute("uri");
+		if (resourcesFolderPath == null) {
+		    QuestionParser.log.warn("Image " + fileName + " declaration found but its location is unknown");
+		} else {
+		    if (question.getResourcesFolderPath() == null) {
+			question.setResourcesFolderPath(resourcesFolderPath);
+		    }
+		    result.append("[IMAGE: ").append(fileName).append("]");
+		}
+	    }
+	}
+
+	return result.toString();
+    }
 }
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/util/UploadFileUtil.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r0dbc1d60bc9b43c26c431c9a2e15981ca0863d46
--- lams_common/src/java/org/lamsfoundation/lams/util/UploadFileUtil.java	(.../UploadFileUtil.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_common/src/java/org/lamsfoundation/lams/util/UploadFileUtil.java	(.../UploadFileUtil.java)	(revision 0dbc1d60bc9b43c26c431c9a2e15981ca0863d46)
@@ -29,160 +29,201 @@
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.fileupload.DiskFileUpload;
+import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.FileUploadException;
 import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 
-
 /**
- * Wraps up interface to the Commons FileUpload as much as possible. Reads configuration 
- * information such the maximum size of a file from lams.xml using the ConfigurationService.
+ * Wraps up interface to the Commons FileUpload as much as possible. Reads configuration information such the maximum
+ * size of a file from lams.xml using the ConfigurationService.
  * 
- * @author fmalikoff
- * 			Fei Yang
+ * @author fmalikoff Fei Yang
  * 
  */
 public class UploadFileUtil {
-	
-	private static Logger log = Logger.getLogger(UploadFileUtil.class);
+    private static Logger log = Logger.getLogger(UploadFileUtil.class);
 
-	private static final int DEFAULT_MAX_SIZE = 5000000; // 5 Meg
-	private static final int DEFAULT_MEMORY_SIZE = 4096;
-	
-	/** Given the current servlet request and the name of a temporary directory,
-	 * get a list of all the uploaded items from a multipart form. This includes any 
-	 * uploaded files and the "normal" input fields on the form. Gets the temporary 
-	 * directory from the configuration file. Equivalent to getUploadItems(request, useLargeFileSize, null)
-	 * @param request - current servlet request
-	 * @param useLargeFileSize - use the large file size. If not true, use the standard file size.
-	 * @return List of items, of type FileItem
-	 */
-	public static List getUploadItems(HttpServletRequest request, boolean useLargeFileSize )
-		throws FileUploadException, Exception
-	{
-		return getUploadItems(request,useLargeFileSize,null);
+    private static final int DEFAULT_MAX_SIZE = 5000000; // 5 Meg
+    private static final int DEFAULT_MEMORY_SIZE = 4096;
+
+    static {
+
+    }
+
+    /**
+     * Given the current servlet request and the name of a temporary directory, get a list of all the uploaded items
+     * from a multipart form. This includes any uploaded files and the "normal" input fields on the form. Gets the
+     * temporary directory from the configuration file. Equivalent to getUploadItems(request, useLargeFileSize, null)
+     * 
+     * @param request
+     *            - current servlet request
+     * @param useLargeFileSize
+     *            - use the large file size. If not true, use the standard file size.
+     * @return List of items, of type FileItem
+     */
+    public static List<FileItem> getUploadItems(HttpServletRequest request, boolean useLargeFileSize)
+	    throws FileUploadException, Exception {
+	return UploadFileUtil.getUploadItems(request, useLargeFileSize, null);
+    }
+
+    /**
+     * Given the current servlet request and the name of a temporary directory, get a list of all the uploaded items
+     * from a multipart form. This includes any uploaded files and the "normal" input fields on the form.
+     * 
+     * @param request
+     *            - current servlet request
+     * @param useLargeFileSize
+     *            - use the large file size. If not true, use the standard file size.
+     * @param tempDirName
+     *            - the name of the directory into which temporary files can be written
+     * @return List of items, of type FileItem
+     */
+    @SuppressWarnings("unchecked")
+    public static List<FileItem> getUploadItems(HttpServletRequest request, boolean useLargeFileSize,
+	    String tempDirNameInput) throws FileUploadException, Exception {
+
+	int max_size = UploadFileUtil.DEFAULT_MAX_SIZE;
+	int max_memory_size;
+	String tempDirName = null;
+
+	int tempInt = -1;
+
+	if (useLargeFileSize) {
+	    tempInt = Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE);
+	    if (tempInt != -1) {
+		max_size = tempInt;
+	    } else {
+		UploadFileUtil.log.warn("Default Large Max Size for file upload missing, using "
+			+ UploadFileUtil.DEFAULT_MAX_SIZE);
+	    }
+	} else {
+	    tempInt = Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_MAX_SIZE);
+	    if (tempInt != -1) {
+		max_size = tempInt;
+	    } else {
+		UploadFileUtil.log.warn("Default Max Size for file upload missing, using "
+			+ UploadFileUtil.DEFAULT_MAX_SIZE);
+	    }
 	}
 
-	/** Given the current servlet request and the name of a temporary directory,
-	 * get a list of all the uploaded items from a multipart form. This includes any 
-	 * uploaded files and the "normal" input fields on the form.
-	 * @param request - current servlet request
-	 * @param useLargeFileSize - use the large file size. If not true, use the standard file size.
-	 * @param tempDirName - the name of the directory into which temporary files can be written
-	 * @return List of items, of type FileItem
-	 */
-	public static List getUploadItems(HttpServletRequest request, boolean useLargeFileSize, String tempDirNameInput)
-		throws FileUploadException, Exception
-	{
-	
-		int max_size = DEFAULT_MAX_SIZE;
-		int max_memory_size;
-		String tempDirName = null;
+	tempInt = Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_MAX_MEMORY_SIZE);
+	if (tempInt != -1) {
+	    max_memory_size = tempInt;
+	} else {
+	    UploadFileUtil.log.warn("Default Max Memory Size for file upload missing, using "
+		    + UploadFileUtil.DEFAULT_MEMORY_SIZE);
+	    max_memory_size = UploadFileUtil.DEFAULT_MEMORY_SIZE;
+	}
 
-		int tempInt=-1;
-		
-		if ( useLargeFileSize )
-		{
-			tempInt = Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE);
-			if(tempInt!=-1)
-			{
-				max_size = tempInt;
-			}
-			else
-			{
-				log.warn("Default Large Max Size for file upload missing, using "+DEFAULT_MAX_SIZE);
-			}	
-		}
-		else
-		{
-			tempInt = Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_MAX_SIZE);
-			if ( tempInt != -1 )
-			{
-				max_size = tempInt;
-			}
-			else
-			{
-				log.warn("Default Max Size for file upload missing, using "+DEFAULT_MAX_SIZE);
-			}	
-		}
+	if (tempDirNameInput != null) {
+	    tempDirName = tempDirNameInput;
+	} else {
+	    tempDirName = Configuration.get(ConfigurationKeys.LAMS_TEMP_DIR);
+	    if (tempDirName == null) {
+		UploadFileUtil.log.warn("Default Temporary Directory missing, using null");
+	    }
+	}
+	// would be nice to only do this once! never mind.
+	if (tempDirName != null) {
+	    File dir = new File(tempDirName);
+	    if (!dir.exists()) {
+		dir.mkdirs();
+	    }
+	}
 
-		tempInt = Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_MAX_MEMORY_SIZE);
-		if ( tempInt != -1 )
-		{
-			max_memory_size = tempInt;
-		}
-		else
-		{
-			log.warn("Default Max Memory Size for file upload missing, using "+DEFAULT_MEMORY_SIZE);
-			max_memory_size = DEFAULT_MEMORY_SIZE;
-		}	
-		
-		if ( tempDirNameInput != null )
-		{
-			tempDirName = tempDirNameInput;
-		}
-		else
-		{
-			tempDirName = Configuration.get(ConfigurationKeys.LAMS_TEMP_DIR);
-			if ( tempDirName == null )
-			{
-				log.warn("Default Temporary Directory missing, using null");
-			}	
-		}
-		// would be nice to only do this once! never mind.
-		if ( tempDirName != null )
-		{
-			File dir = new File(tempDirName);
-			if ( ! dir.exists() )
-				dir.mkdirs();
-		}
-		
+	// Create a new file upload handler
+	DiskFileUpload upload = new DiskFileUpload();
 
-	    // Create a new file upload handler
-	    DiskFileUpload upload = new DiskFileUpload();
-	
-	    // Set upload parameters
-	    upload.setSizeMax(max_size);
-	    upload.setSizeThreshold(max_memory_size);
-	    upload.setRepositoryPath(tempDirName);
-	
-	    // Parse the request
-	    List items = upload.parseRequest(request);
-	    return items;
+	// Set upload parameters
+	upload.setSizeMax(max_size);
+	upload.setSizeThreshold(max_memory_size);
+	upload.setRepositoryPath(tempDirName);
+
+	// Parse the request
+	List<FileItem> items = upload.parseRequest(request);
+	return items;
+    }
+
+    /**
+     * @return Maximum size (in megabytes) that a file may be. Standard size, use during running of sequence.
+     */
+    public static float getMaxFileSize() {
+	int max_size = UploadFileUtil.DEFAULT_MAX_SIZE;
+
+	int tempInt = Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_MAX_SIZE);
+	if (tempInt != -1) {
+	    max_size = tempInt;
 	}
-	
 
-	/** 
-	 * @return Maximum size (in megabytes) that a file may be. Standard size, use during running
-	 * of sequence.
-	 */
-	public static float getMaxFileSize()
-	{
-		int max_size = DEFAULT_MAX_SIZE;
-		
-		int tempInt = Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_MAX_SIZE);
-		if ( tempInt != -1 )
-		{
-			max_size = tempInt;
-		}
+	return (max_size != 0 ? (float) max_size / 1024 / 1024 : (float) 0);
+    }
 
-		return ( max_size != 0 ? (float) max_size / 1024 / 1024 : (float) 0 );		
+    /**
+     * @return Maximum size (in megabytes) that a file may be. Large size, use during authoring only.
+     */
+    public static float getMaxLargeFileSize() {
+	int max_size = UploadFileUtil.DEFAULT_MAX_SIZE;
+
+	int tempInt = Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE);
+	if (tempInt != -1) {
+	    max_size = tempInt;
 	}
 
-	/** 
-	 * @return Maximum size (in megabytes) that a file may be. Large size, use during 
-	 * authoring only.
-	 */
-	public static float getMaxLargeFileSize()
-	{
-		int max_size = DEFAULT_MAX_SIZE;
-		
-		int tempInt = Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE);
-		if ( tempInt != -1 )
-		{
-			max_size = tempInt;
-		}
+	return (max_size != 0 ? (float) max_size / 1024 / 1024 : (float) 0);
+    }
 
-		return ( max_size != 0 ? (float) max_size / 1024 / 1024 : (float) 0 );		
+    /**
+     * Returns dir where resources get uploaded for all lessons.
+     */
+    public static File getUploadBaseDir() {
+	String baseDirPath = Configuration.get(ConfigurationKeys.LAMS_EAR_DIR) + File.separator + FileUtil.LAMS_WWW_DIR
+		+ File.separator + FileUtil.LAMS_WWW_SECURE_DIR;
+	File baseDir = new File(baseDirPath);
+	baseDir.mkdir();
+	return baseDir;
+    }
+
+    /**
+     * Returns dir where images and other resources can be uploaded.
+     */
+    public static File getUploadDir(String contentFolderID, String type) {
+	File uploadDir = new File(UploadFileUtil.getUploadBaseDir(), contentFolderID + File.separatorChar + type);
+	uploadDir.mkdirs();
+	return uploadDir;
+    }
+
+    /**
+     * Checks if given name already exists in upload dir. If so, it returns next free name.
+     */
+    public static String getUploadFileName(File uploadDir, String fileName) {
+	int counter = 1;
+	String finalName = fileName;
+	File uploadFile = new File(uploadDir, fileName);
+	while (uploadFile.exists()) {
+	    finalName = UploadFileUtil.getFileNameWithoutExtension(fileName) + "_" + counter + "."
+		    + UploadFileUtil.getFileExtension(fileName);
+	    uploadFile = new File(uploadDir, finalName);
+	    counter++;
 	}
+	return finalName;
+    }
 
-}
+    /**
+     * Get the path where the uploaded file will be accessible via HTTP.
+     */
+    public static String getUploadWebPath(String contentFolderID, String type) {
+	return "/" + Configuration.get(ConfigurationKeys.SERVER_URL_CONTEXT_PATH) + "/"
+		+ AuthoringConstants.LAMS_WWW_FOLDER + FileUtil.LAMS_WWW_SECURE_DIR
+		+ (contentFolderID.startsWith("/") ? "" : "/") + contentFolderID
+		+ (contentFolderID.endsWith("/") ? "" : "/") + type;
+    }
+
+    public static String getFileNameWithoutExtension(String fileName) {
+	return fileName.substring(0, fileName.lastIndexOf("."));
+    }
+
+    public static String getFileExtension(String fileName) {
+	return fileName.substring(fileName.lastIndexOf(".") + 1);
+    }
+}
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/util/zipfile/ZipFileUtil.java
===================================================================
diff -u -r298d075b933d9304102c935364c63d69a9e2739f -r0dbc1d60bc9b43c26c431c9a2e15981ca0863d46
--- lams_common/src/java/org/lamsfoundation/lams/util/zipfile/ZipFileUtil.java	(.../ZipFileUtil.java)	(revision 298d075b933d9304102c935364c63d69a9e2739f)
+++ lams_common/src/java/org/lamsfoundation/lams/util/zipfile/ZipFileUtil.java	(.../ZipFileUtil.java)	(revision 0dbc1d60bc9b43c26c431c9a2e15981ca0863d46)
@@ -40,349 +40,343 @@
 import org.lamsfoundation.lams.util.FileUtilException;
 
 /**
- * Handles zip files - expands them to a temporary directory, and 
- * deletes them on request.
+ * Handles zip files - expands them to a temporary directory, and deletes them on request.
  * 
  * @author Fiona Malikoff
  */
 public class ZipFileUtil {
 
-	private static Logger log = Logger.getLogger(ZipFileUtil.class);
-	public static final String prefix = "lamszip_"; // public to use in TempDirectoryFilter
-	private static int BUFFER_SIZE = 8192;
+    private static Logger log = Logger.getLogger(ZipFileUtil.class);
+    public static final String prefix = "lamszip_"; // public to use in TempDirectoryFilter
+    private static int BUFFER_SIZE = 8192;
 
-	/**
-	 * Given a zip file as an input stream and the name of the zip file, expand the zip file
-	 * to a temporary directory.
-	 * 
-	 * The directory will be in the directory specified in the system property 
-	 * "java.io.tmpdir". This will normally be the o/s level temporary directory.
-	 * e.g. /tmp or c:/temp.
-	 * 
-	 * A zip file name.zip will be expanded to something like 
-	 * lamszip_1212121212_name. It tries 100 different names, based on 
-	 * the current time in milliseconds and a counter. If it hasn't
-	 * found a unique name by then, it fails. So potentially, it will
-	 * fail if the system has to expand more than 100 zip files in a
-	 * millisecond, where the zip files all have the same name. Want to 
-	 * bet on those chances?
-	 * 
-	 * @param is
-	 * @param zipFileName
-	 * @throws ZipFileUtilException
-	 */
-	public static String expandZip(InputStream is, String zipFileName) throws ZipFileUtilException {
-	    String tempDirName = prepareTempDirectory(zipFileName);
-	    extractZipFile(is, tempDirName);
-	    return tempDirName;
+    /**
+     * Given a zip file as an input stream and the name of the zip file, expand the zip file to a temporary directory.
+     * 
+     * The directory will be in the directory specified in the system property "java.io.tmpdir". This will normally be
+     * the o/s level temporary directory. e.g. /tmp or c:/temp.
+     * 
+     * A zip file name.zip will be expanded to something like lamszip_1212121212_name. It tries 100 different names,
+     * based on the current time in milliseconds and a counter. If it hasn't found a unique name by then, it fails. So
+     * potentially, it will fail if the system has to expand more than 100 zip files in a millisecond, where the zip
+     * files all have the same name. Want to bet on those chances?
+     * 
+     * @param is
+     * @param zipFileName
+     * @throws ZipFileUtilException
+     */
+    public static String expandZip(InputStream is, String zipFileName) throws ZipFileUtilException {
+	String tempDirName = ZipFileUtil.prepareTempDirectory(zipFileName);
+	ZipFileUtil.extractZipFile(is, tempDirName);
+	return tempDirName;
+    }
+
+    public static void expandZipToFolder(InputStream is, String destFolder) throws ZipFileUtilException {
+	ZipFileUtil.extractZipFile(is, destFolder);
+    }
+
+    /**
+     * Create a temporary directory in which the zip file contents will go. This method is protected (rather than
+     * private) so that it may be called by the junit tests for this class.
+     * 
+     * @param zipFileName
+     * @return name of the new directory
+     * @throws ZipFileUtilException
+     *             if the java io temp directory is not defined, or we are unable to calculate a unique name for the
+     *             expanded directory, or an IOException occurs.
+     */
+    protected static String prepareTempDirectory(String zipFileName) throws ZipFileUtilException {
+	int dotIndex = zipFileName.indexOf(".");
+	String shortZipName = dotIndex > -1 ? zipFileName.substring(0, dotIndex) : zipFileName;
+
+	String tempSysDirName = System.getProperty("java.io.tmpdir");
+	if (tempSysDirName == null) {
+	    throw new ZipFileUtilException(
+		    "No temporary directory known to the server. [System.getProperty( \"java.io.tmpdir\" ) returns null. ]\n Cannot upload package.");
 	}
-	
-	public static void expandZipToFolder(InputStream is, String destFolder) throws ZipFileUtilException {
-		extractZipFile(is, destFolder);
+
+	String tempDirName = tempSysDirName + File.separator + ZipFileUtil.prefix + System.currentTimeMillis() + "_"
+		+ shortZipName;
+
+	// Set up the directory. Check it doesn't exist and if it does
+	// try 100 slightly different variations. If I can't find a unique
+	// one in ten tries, then give up.
+	File tempDir = new File(tempDirName);
+	int i = 0;
+	while (tempDir.exists() && (i < 100)) {
+	    tempDirName = tempSysDirName + File.separator + ZipFileUtil.prefix + System.currentTimeMillis() + "_" + i
+		    + shortZipName;
+	    tempDir = new File(tempDirName);
 	}
+	if (tempDir.exists()) {
+	    throw new ZipFileUtilException(
+		    "Temporary filename/directory that we would use to extract files already exists: " + tempDirName
+			    + ". Unable to upload Content Package.");
+	}
 
-	/**
-	 * Create a temporary directory in which the zip file contents will go.
-	 * This method is protected (rather than private) so that it may be 
-	 * called by the junit tests for this class.
-	 * @param zipFileName
-	 * @return name of the new directory
-	 * @throws ZipFileUtilException if the java io temp directory is not defined,
-	 * or we are unable to calculate a unique name for the expanded directory,
-	 * or an IOException occurs.
-	 */
-	protected static String prepareTempDirectory(String zipFileName) throws ZipFileUtilException {
-		int dotIndex = zipFileName.indexOf(".");
-		String shortZipName = dotIndex > -1 ? zipFileName.substring(0,dotIndex) : zipFileName;
-		
-		String tempSysDirName = System.getProperty( "java.io.tmpdir" );
-		if ( tempSysDirName == null )
-			throw new ZipFileUtilException("No temporary directory known to the server. [System.getProperty( \"java.io.tmpdir\" ) returns null. ]\n Cannot upload package.");
-	
-		String tempDirName = tempSysDirName+File.separator
-			+prefix+System.currentTimeMillis()+"_"+shortZipName;
-		
-		// Set up the directory. Check it doesn't exist and if it does
-		// try 100 slightly different variations. If I can't find a unique
-		// one in ten tries, then give up.
-		File tempDir = new File(tempDirName);
-		int i = 0;
-		while ( tempDir.exists() && i < 100 ) {
-			tempDirName = tempSysDirName+File.separator
-				+prefix+System.currentTimeMillis()+"_"+i+shortZipName;
-			tempDir = new File(tempDirName);
+	tempDir.mkdirs();
+	return tempDirName;
+    }
+
+    private static void extractZipFile(InputStream is, String tempDirName) throws ZipFileUtilException {
+	// got our directory, so write out the input file and expand the zip file
+	// this is really a hack - write it out temporarily then read it back in again! urg!!!!
+	ZipInputStream zis = new ZipInputStream(is);
+	int count;
+	byte data[] = new byte[ZipFileUtil.BUFFER_SIZE];
+	ZipEntry entry = null;
+	BufferedOutputStream dest = null;
+	String entryName = null;
+
+	try {
+
+	    // work through each file, creating a node for each file
+	    while ((entry = zis.getNextEntry()) != null) {
+
+		if (!entry.isDirectory()) {
+		    entryName = entry.getName();
+
+		    String destName = tempDirName + File.separator + entryName;
+		    // It must sort out the directory information to current OS.
+		    // e.g, if zip file is zipped under windows, but unzip in linux.
+		    destName = FileUtil.makeCanonicalPath(destName);
+
+		    ZipFileUtil.prepareDirectory(destName);
+
+		    FileOutputStream fos = new FileOutputStream(destName);
+		    dest = new BufferedOutputStream(fos, ZipFileUtil.BUFFER_SIZE);
+		    while ((count = zis.read(data, 0, ZipFileUtil.BUFFER_SIZE)) != -1) {
+			dest.write(data, 0, count);
+		    }
+		    dest.flush();
+		    dest.close();
+		    dest = null;
 		}
-		if ( tempDir.exists() )
-			throw new ZipFileUtilException("Temporary filename/directory that we would use to extract files already exists: "
-					+tempDirName+". Unable to upload Content Package.");
-		
-		tempDir.mkdirs();
-		return tempDirName;
-	}
-	
-	private static void extractZipFile(InputStream is, String tempDirName) throws ZipFileUtilException {
-		// got our directory, so write out the input file and expand the zip file
-		// this is really a hack - write it out temporarily then read it back in again! urg!!!!
-		ZipInputStream zis = new ZipInputStream(is);
-	    int count;
-	    byte data[] = new byte[ BUFFER_SIZE ];
-		ZipEntry entry = null; 
-		BufferedOutputStream dest = null;
-		String entryName = null;
-		
+
+	    }
+
+	} catch (IOException ioe) {
+
+	    ZipFileUtil.log.error("Exception occured processing entries in zip file. Entry was " + entryName, ioe);
+	    throw new ZipFileUtilException("Exception occured processing entries in zip file. Entry was " + entryName,
+		    ioe);
+
+	} finally {
+
+	    if (dest != null) {
 		try {
-			
-	 		// work through each file, creating a node for each file
-	        while( ( entry = zis.getNextEntry() ) != null ) {
-				
-				if( !entry.isDirectory() )
-			    {
-					entryName = entry.getName();
-					
-					String destName = tempDirName + File.separator + entryName;
-					//It must sort out the directory information to current OS. 
-					//e.g, if zip file is zipped under windows, but unzip in linux.  
-					destName = FileUtil.makeCanonicalPath(destName);
-					
-					prepareDirectory(destName);
-					
-			        FileOutputStream fos = new FileOutputStream( destName );
-			        dest = new BufferedOutputStream( fos, BUFFER_SIZE );
-			        while( (count = zis.read( data, 0, BUFFER_SIZE ) ) != -1 )
-			        {
-			        	dest.write( data, 0, count );
-			        }
-		            dest.flush();
-		            dest.close();
-		            dest = null;
-			    }
-		
-	        }
-			
-		} catch ( IOException ioe ) {
-			
-			log.error("Exception occured processing entries in zip file. Entry was "+entryName,ioe);
-			throw new ZipFileUtilException("Exception occured processing entries in zip file. Entry was "+entryName,ioe);
-			
-		} finally {
-			
-			if ( dest != null ) {
-				try { 
-					dest.close();
-				} catch ( IOException ioe2 ) {
-					log.error("Exception thrown in finally statement, trying to close destination file.",ioe2);
-				}
-			}
+		    dest.close();
+		} catch (IOException ioe2) {
+		    ZipFileUtil.log.error("Exception thrown in finally statement, trying to close destination file.",
+			    ioe2);
 		}
+	    }
 	}
+    }
 
+    /**
+     * @param destName
+     */
+    private static void prepareDirectory(String destName) {
 
-	/**
-	 * @param destName
-	 */
-	private static void prepareDirectory(String destName) {
-	
-		File destNameFile = new File(destName);
-		String path = destNameFile.getParent();
-		if(path != null){
-			File pathDir = new File(path);
-			pathDir.mkdirs();
-		}
+	File destNameFile = new File(destName);
+	String path = destNameFile.getParent();
+	if (path != null) {
+	    File pathDir = new File(path);
+	    pathDir.mkdirs();
 	}
+    }
 
-	/** Delete a temporary directory.
-	 * Checks that the directory name supplied looks like a temporary directory 
-	 * (ie is in the java tmp directory and starts with lamszip_)
-	 * 
-	 * @param directoryName
-	 * @return false if directoryName == null  or one or more of the files/directories could not be deleted. See
-	 * log for list of not deleted files.
-	 * @throws ZipFileUtilException if the directory name doesn't look like
-	 * a temporary directory created by the helper.
-	 */
-	public static boolean deleteDirectory(String directoryName) throws ZipFileUtilException {
-		if ( directoryName != null ) {
-			String tempSysDirNamePrefix = System.getProperty( "java.io.tmpdir" )
-				+File.separator +prefix;
-		    if ( ! directoryName.startsWith(tempSysDirNamePrefix) ) {
-		        throw new ZipFileUtilException("Invalid directory delete request. Received request to delete directory "
-		                + directoryName 
-		                + " but name doesn't start with the temporary directory location ("
-		                + tempSysDirNamePrefix 
-		                + "). Not deleting directory");
-		    }
-		    
-			return FileUtil.deleteDirectory(new File(directoryName));
-		}
-		return false;
+    /**
+     * Delete a temporary directory. Checks that the directory name supplied looks like a temporary directory (ie is in
+     * the java tmp directory and starts with lamszip_)
+     * 
+     * @param directoryName
+     * @return false if directoryName == null or one or more of the files/directories could not be deleted. See log for
+     *         list of not deleted files.
+     * @throws ZipFileUtilException
+     *             if the directory name doesn't look like a temporary directory created by the helper.
+     */
+    public static boolean deleteDirectory(String directoryName) throws ZipFileUtilException {
+	if (directoryName != null) {
+	    String tempSysDirNamePrefix = System.getProperty("java.io.tmpdir") + File.separator + ZipFileUtil.prefix;
+	    if (!directoryName.startsWith(tempSysDirNamePrefix)) {
+		throw new ZipFileUtilException(
+			"Invalid directory delete request. Received request to delete directory " + directoryName
+				+ " but name doesn't start with the temporary directory location ("
+				+ tempSysDirNamePrefix + "). Not deleting directory");
+	    }
+
+	    return FileUtil.deleteDirectory(new File(directoryName));
 	}
-	
+	return false;
+    }
+
     private static String appendToString(String origString, String newMessage) {
-        if ( origString != null )
-            return origString + "   \n" +newMessage;
-        else
-            return newMessage;
+	if (origString != null) {
+	    return origString + "   \n" + newMessage;
+	} else {
+	    return newMessage;
+	}
     }
-  
+
     /**
-     * Creates a ZIP file and places it in the current working directory. The zip file is compressed
-     * at the default compression level of the Deflater.
-     * @param zipFileName the filename of the zip to create
-     * @param directoryToZip the directory you want to zip
+     * Creates a ZIP file and places it in the current working directory. The zip file is compressed at the default
+     * compression level of the Deflater.
+     * 
+     * @param zipFileName
+     *            the filename of the zip to create
+     * @param directoryToZip
+     *            the directory you want to zip
      * @return the filename of the zip file created
      * @throws ZipFileUtilException
      */
-    public static String createZipFile(String zipFileName, String directoryToZip) throws ZipFileUtilException //public static String createZipFile(String ZipFileName, String[] filesToZip)
+    public static String createZipFile(String zipFileName, String directoryToZip) throws ZipFileUtilException // public
+													      // static
+													      // String
+													      // createZipFile(String
+													      // ZipFileName,
+													      // String[]
+													      // filesToZip)
     {
-    	
-    	int dotIndex = zipFileName.indexOf(".");
-		
-		String fileNameOfZipToCreate = dotIndex > -1 ? zipFileName : zipFileName+".zip"; //append ".zip" extension if the filename doesnt contain .zip extension
-        
-		
-		try
-		{
-        	ZipOutputStream out = new ZipOutputStream(new BufferedOutputStream(new FileOutputStream(fileNameOfZipToCreate)));
-        	File directory = new File(directoryToZip);
-        	if(!directory.exists())
-        	{
-        		throw new ZipFileUtilException("The specified directory " + directoryToZip + " does not exist");
-        	}
-        	File[] files = directory.listFiles();
-        	
-        	zipFiles(out, files, directory.getCanonicalPath());
-        	out.close();       	
-		}
-		catch (IOException e1)
-		{
-			throw new ZipFileUtilException("An error has occurred while trying to zip the files. Error message is: "+e1.getMessage(), e1);
-		}
-        
-    	return fileNameOfZipToCreate;
+
+	int dotIndex = zipFileName.indexOf(".");
+
+	String fileNameOfZipToCreate = dotIndex > -1 ? zipFileName : zipFileName + ".zip"; // append ".zip" extension if
+											   // the filename doesnt
+											   // contain .zip extension
+
+	try {
+	    ZipOutputStream out = new ZipOutputStream(new BufferedOutputStream(new FileOutputStream(
+		    fileNameOfZipToCreate)));
+	    File directory = new File(directoryToZip);
+	    if (!directory.exists()) {
+		throw new ZipFileUtilException("The specified directory " + directoryToZip + " does not exist");
+	    }
+	    File[] files = directory.listFiles();
+
+	    ZipFileUtil.zipFiles(out, files, directory.getCanonicalPath());
+	    out.close();
+	} catch (IOException e1) {
+	    throw new ZipFileUtilException("An error has occurred while trying to zip the files. Error message is: "
+		    + e1.getMessage(), e1);
+	}
+
+	return fileNameOfZipToCreate;
     }
-    
+
     /**
-     * Creates a ZIP file and places it in the specified directory. The zip file is compressed
-     * at the default compression level of the Deflater.
-     * @param zipFileName the filename of the zip to create
-     * @param directoryToZip the directory you want to zip
-     * @param directoryToPlaceZip the place where you want to place the newly created zip file.
+     * Creates a ZIP file and places it in the specified directory. The zip file is compressed at the default
+     * compression level of the Deflater.
+     * 
+     * @param zipFileName
+     *            the filename of the zip to create
+     * @param directoryToZip
+     *            the directory you want to zip
+     * @param directoryToPlaceZip
+     *            the place where you want to place the newly created zip file.
      * @return the (absolute) filename of the zip that was created
      * @throws ZipFileUtilException
      */
-    public static String createZipFile(String zipFileName, String directoryToZip, String directoryToPlaceZip) throws ZipFileUtilException //public static String createZipFile(String ZipFileName, String[] filesToZip)
+    public static String createZipFile(String zipFileName, String directoryToZip, String directoryToPlaceZip)
+	    throws ZipFileUtilException // public static String createZipFile(String ZipFileName, String[] filesToZip)
     {
-        
-        //check if the directory to place zip file exists, if it doesnt, then create one.
-        /* TODO: should we overwrite and delete the folder if it already exists? */
-        if (!FileUtil.directoryExist(directoryToPlaceZip))
-        {
-            try
-            {
-                FileUtil.createDirectory(directoryToPlaceZip);
-            }
-            catch(FileUtilException e)
-            {
-                throw new ZipFileUtilException("The temporary directory to place the zip file could be not created: "+e.getMessage(), e);
-            }
-        }
-        
-    	int dotIndex = zipFileName.indexOf(".");
-		
-		String zipFile = dotIndex > -1 ? zipFileName : zipFileName+".zip"; //append ".zip" extension if the filename doesnt contain .zip extension
-        String fileNameOfZipToCreate = directoryToPlaceZip + File.separator + zipFile;
-		
-		
-		try
-		{
-        	ZipOutputStream out = new ZipOutputStream(new BufferedOutputStream(new FileOutputStream(fileNameOfZipToCreate)));
-        	
-            File directory = new File(directoryToZip);
-        	if(!directory.exists())
-        	{
-        		throw new ZipFileUtilException("The specified directory " + directoryToZip + " does not exist");
-        	}
-        	File[] files = directory.listFiles();
-        	
-        	zipFiles(out, files, directory.getCanonicalPath());
-        	out.close();       	
-		}
-		catch (IOException e1)
-		{
-			throw new ZipFileUtilException("An error has occurred while trying to zip the files. Error message is: "+e1.getMessage(), e1);
-		}
-      
-    	return fileNameOfZipToCreate;
+
+	// check if the directory to place zip file exists, if it doesnt, then create one.
+	/* TODO: should we overwrite and delete the folder if it already exists? */
+	if (!FileUtil.directoryExist(directoryToPlaceZip)) {
+	    try {
+		FileUtil.createDirectory(directoryToPlaceZip);
+	    } catch (FileUtilException e) {
+		throw new ZipFileUtilException("The temporary directory to place the zip file could be not created: "
+			+ e.getMessage(), e);
+	    }
+	}
+
+	int dotIndex = zipFileName.indexOf(".");
+
+	String zipFile = dotIndex > -1 ? zipFileName : zipFileName + ".zip"; // append ".zip" extension if the filename
+									     // doesnt contain .zip extension
+	String fileNameOfZipToCreate = directoryToPlaceZip + File.separator + zipFile;
+
+	try {
+	    ZipOutputStream out = new ZipOutputStream(new BufferedOutputStream(new FileOutputStream(
+		    fileNameOfZipToCreate)));
+
+	    File directory = new File(directoryToZip);
+	    if (!directory.exists()) {
+		throw new ZipFileUtilException("The specified directory " + directoryToZip + " does not exist");
+	    }
+	    File[] files = directory.listFiles();
+
+	    ZipFileUtil.zipFiles(out, files, directory.getCanonicalPath());
+	    out.close();
+	} catch (IOException e1) {
+	    throw new ZipFileUtilException("An error has occurred while trying to zip the files. Error message is: "
+		    + e1.getMessage(), e1);
+	}
+
+	return fileNameOfZipToCreate;
     }
-    
-    
-    protected static void zipFiles(ZipOutputStream zop, File[] files, String dirPath) throws ZipFileUtilException
-    {
-    	File file = null;
-    	ZipEntry entry = null;
-		BufferedInputStream source = null;
-		byte[] data = new byte[ BUFFER_SIZE ]; //byte[] buffer = new byte[ 1024 ]; //what size should we use? 1024?
-		
-		try
-		{
-	    	for (int i=0; i< files.length; i++)
-	    	{
-	    		file = files[i];
-	    		//if file is a directory, recursively call this method
-	    		if (file.isDirectory())
-	    		{
-	    			File[] filesInsideDir = file.listFiles();
-	    			zipFiles(zop, filesInsideDir, dirPath);
-	    		}
-	    		else
-	    		{
-	    			source = new BufferedInputStream(new FileInputStream(file));
-	    			//entry = new ZipEntry(file.getPath());
-	    			entry = new ZipEntry(removeDirPath(file.getCanonicalPath(), dirPath));
-	    			zop.setMethod(ZipOutputStream.DEFLATED);
-	    			zop.setLevel(Deflater.DEFAULT_COMPRESSION);
-	    					
-		    		zop.putNextEntry(entry);
-		    		
-		    		//transfer bytes from file to ZIP file
-		    		int length;
-		    		while((length = source.read(data)) > 0)
-		    		{
-		    			zop.write(data, 0, length);
-		    		}
-		    		
-		    		zop.closeEntry();
-		    		source.close(); 
-		    		
-		    		source=null;
-		    		
-	    		}
-	    		
-	    		
-	    	}
+
+    protected static void zipFiles(ZipOutputStream zop, File[] files, String dirPath) throws ZipFileUtilException {
+	File file = null;
+	ZipEntry entry = null;
+	BufferedInputStream source = null;
+	byte[] data = new byte[ZipFileUtil.BUFFER_SIZE]; // byte[] buffer = new byte[ 1024 ]; //what size should we use?
+							 // 1024?
+
+	try {
+	    for (int i = 0; i < files.length; i++) {
+		file = files[i];
+		// if file is a directory, recursively call this method
+		if (file.isDirectory()) {
+		    File[] filesInsideDir = file.listFiles();
+		    ZipFileUtil.zipFiles(zop, filesInsideDir, dirPath);
+		} else {
+		    source = new BufferedInputStream(new FileInputStream(file));
+		    // entry = new ZipEntry(file.getPath());
+		    entry = new ZipEntry(ZipFileUtil.removeDirPath(file.getCanonicalPath(), dirPath));
+		    zop.setMethod(ZipOutputStream.DEFLATED);
+		    zop.setLevel(Deflater.DEFAULT_COMPRESSION);
+
+		    zop.putNextEntry(entry);
+
+		    // transfer bytes from file to ZIP file
+		    int length;
+		    while ((length = source.read(data)) > 0) {
+			zop.write(data, 0, length);
+		    }
+
+		    zop.closeEntry();
+		    source.close();
+
+		    source = null;
+
 		}
-		catch(IOException e)
-		{
-			throw new ZipFileUtilException("An error has occurred while trying to zip the files. Error message is: "+e.getMessage(), e);
-		}
+
+	    }
+	} catch (IOException e) {
+	    throw new ZipFileUtilException("An error has occurred while trying to zip the files. Error message is: "
+		    + e.getMessage(), e);
+	}
     }
-    
+
     /**
-     * Helper method used to cut off the root directory path from the absolute path
-     * of the file. We want the relative path so that when zipped up, the upper directories
-     * arent shown.
-     * @param absoluteFilePath the absolute pathname of the file
-     * @param rootDirPath the root directory path
+     * Helper method used to cut off the root directory path from the absolute path of the file. We want the relative
+     * path so that when zipped up, the upper directories arent shown.
+     * 
+     * @param absoluteFilePath
+     *            the absolute pathname of the file
+     * @param rootDirPath
+     *            the root directory path
      * @return
      */
-   private static String removeDirPath(String absoluteFilePath, String rootDirPath)
-   {
-       int rootDirLength = rootDirPath.length();
-       return absoluteFilePath.substring(rootDirLength+1, absoluteFilePath.length()); //added one to remove the trailing "\" that is behind the root dir
-   }
-   
-   
-  
-    
-}
+    private static String removeDirPath(String absoluteFilePath, String rootDirPath) {
+	int rootDirLength = rootDirPath.length();
+	return absoluteFilePath.substring(rootDirLength + 1, absoluteFilePath.length()); // added one to remove the
+											 // trailing "\" that is behind
+											 // the root dir
+    }
 
+}
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
===================================================================
diff -u -ra43256ee6435f1cd14f46c235e4d507957a86a5b -r0dbc1d60bc9b43c26c431c9a2e15981ca0863d46
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision a43256ee6435f1cd14f46c235e4d507957a86a5b)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 0dbc1d60bc9b43c26c431c9a2e15981ca0863d46)
@@ -786,6 +786,7 @@
 	    HttpServletResponse response) throws UnsupportedEncodingException {
 	String sessionMapId = request.getParameter(AssessmentConstants.ATTR_SESSION_MAP_ID);
 	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapId);
+	String contentFolderID = (String) sessionMap.get(AttributeNames.PARAM_CONTENT_FOLDER_ID);
 	SortedSet<AssessmentQuestion> questionList = getQuestionList(sessionMap);
 
 	Question[] questions = QuestionParser.parseQuestionChoiceForm(request.getQueryString());
@@ -799,8 +800,10 @@
 	    }
 	    assessmentQuestion.setSequenceId(maxSeq);
 	    assessmentQuestion.setTitle(question.getTitle());
-	    assessmentQuestion.setQuestion(question.getText());
-	    assessmentQuestion.setGeneralFeedback(question.getFeedback());
+	    assessmentQuestion.setQuestion(QuestionParser.processHTMLField(question.getText(), false, contentFolderID,
+		    question.getResourcesFolderPath()));
+	    assessmentQuestion.setGeneralFeedback(QuestionParser.processHTMLField(question.getFeedback(), false, contentFolderID,
+		    question.getResourcesFolderPath()));
 	    assessmentQuestion.setPenaltyFactor(0);
 
 	    int questionGrade = 1;
@@ -824,7 +827,8 @@
 			    new SequencableComparator());
 		    int orderId = 1;
 		    for (Answer answer : question.getAnswers()) {
-			String answerText = answer.getText();
+			String answerText = QuestionParser.processHTMLField(answer.getText(), false, contentFolderID,
+				question.getResourcesFolderPath());
 			if ((correctAnswer != null) && correctAnswer.equals(answerText)) {
 			    AuthoringAction.log.warn("Skipping an answer with same text as the correct answer: "
 				    + answerText);
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
===================================================================
diff -u -rf9b2102cf2cabf9b832a4d5cd002bd0618ce4050 -r0dbc1d60bc9b43c26c431c9a2e15981ca0863d46
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision f9b2102cf2cabf9b832a4d5cd002bd0618ce4050)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision 0dbc1d60bc9b43c26c431c9a2e15981ca0863d46)
@@ -703,6 +703,9 @@
 		continue;
 	    }
 
+	    questionText = QuestionParser.processHTMLField(questionText, false, contentFolderID,
+		    question.getResourcesFolderPath());
+
 	    if (AuthoringUtil.checkDuplicateQuestions(listQuestionContentDTO, questionText)) {
 		LamsDispatchAction.log.warn("Skipping duplicate question: " + questionText);
 		continue;
@@ -715,7 +718,11 @@
 	    if (question.getAnswers() != null) {
 		for (Answer answer : question.getAnswers()) {
 		    McCandidateAnswersDTO mcCandidateAnswersDTO = new McCandidateAnswersDTO();
-		    String answerText = answer.getText();
+		    String answerText = QuestionParser.processHTMLField(answer.getText(), true, null, null);
+		    if (answerText == null) {
+			LamsDispatchAction.log.warn("Skipping a blank answer");
+			continue;
+		    }
 		    if (correctAnswer != null && correctAnswer.equals(answerText)) {
 			LamsDispatchAction.log.warn("Skipping an answer with same text as the correct answer: "
 				+ answerText);
@@ -754,7 +761,7 @@
 	    McQuestionContentDTO mcQuestionContentDTO = new McQuestionContentDTO();
 	    mcQuestionContentDTO.setDisplayOrder(String.valueOf(listQuestionContentDTO.size() + 1));
 	    mcQuestionContentDTO.setQuestion(questionText);
-	    mcQuestionContentDTO.setFeedback(question.getFeedback());
+	    mcQuestionContentDTO.setFeedback(QuestionParser.processHTMLField(question.getFeedback(), true, null, null));
 	    mcQuestionContentDTO.setListCandidateAnswersDTO(caList);
 	    mcQuestionContentDTO.setMark(correctAnswerScore.toString());
 	    mcQuestionContentDTO.setCaCount(String.valueOf(caList.size()));
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java
===================================================================
diff -u -ra43256ee6435f1cd14f46c235e4d507957a86a5b -r0dbc1d60bc9b43c26c431c9a2e15981ca0863d46
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision a43256ee6435f1cd14f46c235e4d507957a86a5b)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 0dbc1d60bc9b43c26c431c9a2e15981ca0863d46)
@@ -691,6 +691,7 @@
 	// big part of code was taken from saveItem() method
 	String sessionMapId = request.getParameter(ScratchieConstants.ATTR_SESSION_MAP_ID);
 	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapId);
+	String contentFolderID = (String) sessionMap.get(AttributeNames.PARAM_CONTENT_FOLDER_ID);
 	SortedSet<ScratchieItem> itemList = getItemList(sessionMap);
 
 	Question[] questions = QuestionParser.parseQuestionChoiceForm(request.getQueryString());
@@ -704,14 +705,16 @@
 	    }
 	    item.setOrderId(maxSeq);
 	    item.setTitle(question.getTitle());
-	    item.setDescription(question.getText());
+	    item.setDescription(QuestionParser.processHTMLField(question.getText(), false, contentFolderID,
+			question.getResourcesFolderPath()));
 
 	    TreeSet<ScratchieAnswer> answerList = new TreeSet<ScratchieAnswer>(new ScratchieAnswerComparator());
 	    String correctAnswer = null;
 	    int orderId = 1;
 	    if (question.getAnswers() != null) {
 		for (Answer answer : question.getAnswers()) {
-		    String answerText = answer.getText();
+		    String answerText = QuestionParser.processHTMLField(answer.getText(), false, contentFolderID,
+				question.getResourcesFolderPath());
 		    if (correctAnswer != null && correctAnswer.equals(answerText)) {
 			log.warn("Skipping an answer with same text as the correct answer: " + answerText);
 			continue;