Index: lams_central/web/includes/javascript/monitorToolSummaryAdvanced.js
===================================================================
diff -u -rbe513b5b177ecf4aa4c83b1725fe3c4dd5113081 -r31e6bbeab2ea68cd74d596bfc0ba41b58d6e49de
--- lams_central/web/includes/javascript/monitorToolSummaryAdvanced.js	(.../monitorToolSummaryAdvanced.js)	(revision be513b5b177ecf4aa4c83b1725fe3c4dd5113081)
+++ lams_central/web/includes/javascript/monitorToolSummaryAdvanced.js	(.../monitorToolSummaryAdvanced.js)	(revision 31e6bbeab2ea68cd74d596bfc0ba41b58d6e49de)
@@ -25,7 +25,12 @@
 		$("#datetime").datetimepicker();
 		if (submissionDeadlineSettings.submissionDeadline != "") {
 			var date = new Date(eval(submissionDeadlineSettings.submissionDeadline));
-			$("#dateInfo").html( formatDate(date) );
+
+			if ( typeof submissionDeadlineSettings.submissionDateString != 'undefined' ) {
+				$("#dateInfo").html( submissionDeadlineSettings.submissionDateString );
+			} else {
+				$("#dateInfo").html( formatDate(date) );
+			}
 			
 			if ( $("#restrictUsageDiv").hasClass("collapse") )  {
 				// new version - using the according
@@ -38,6 +43,7 @@
 		}
 	});	
 	
+	// fallback routine for when Java formatted dates are not available
 	function formatDate(date) {
 		var currHour = "" + date.getHours();
 		if (currHour.length == 1) {
@@ -64,10 +70,15 @@
 					+ date.getTime() + "&reqID=" + reqIDVar.getTime();
 		$.ajax({
 			url : url,
-			success : function() {
+			success : function(data) {
+				debugger;
 				$.growlUI(submissionDeadlineSettings.messageNotification, submissionDeadlineSettings.messageRestrictionSet);
 				$("#datetimeDiv").hide();
-				$("#dateInfo").html(formatDate(date) );
+				if ( data != '' ) {
+					$("#dateInfo").html( data );
+				} else {
+					$("#dateInfo").html( formatDate(date) );
+				}
 				$("#dateInfoDiv").show();
 			}
 		});
@@ -84,7 +95,6 @@
 			success : function() {
 				$.growlUI(submissionDeadlineSettings.messageNotification, submissionDeadlineSettings.messageRestrictionRemoved);
 				$("#dateInfoDiv").hide();
-				
 				$("#datetimeDiv").show();
 				$("#datetime").val("");
 			}
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
===================================================================
diff -u -r0550d38d2c0eb5b51a510aa4234526ce08fb5c70 -r31e6bbeab2ea68cd74d596bfc0ba41b58d6e49de
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	(.../QaAppConstants.java)	(revision 0550d38d2c0eb5b51a510aa4234526ce08fb5c70)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	(.../QaAppConstants.java)	(revision 31e6bbeab2ea68cd74d596bfc0ba41b58d6e49de)
@@ -202,6 +202,7 @@
     public static final String NO_TOOL_SESSIONS_AVAILABLE = "noToolSessionAvailable";
     public static final String ATTR_CONTENT = "content";
     public static final String ATTR_SUBMISSION_DEADLINE = "submissionDeadline";
+    public static final String ATTR_SUBMISSION_DEADLINE_DATESTRING = "submissionDateString";
     public static final String PARAM_SHOW_OTHER_ANSWERS_AFTER_DEADLINE = "showOtherAnswersAfterDeadline";
     public static final String ATTR_IS_SUBMISSION_DEADLINE_PASSED = "isSubmissionDeadlinePassed";
     public static final String ATTR_GROUP_USERS = "groupUsers";
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r31e6bbeab2ea68cd74d596bfc0ba41b58d6e49de
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java	(.../QaMonitoringAction.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java	(.../QaMonitoringAction.java)	(revision 31e6bbeab2ea68cd74d596bfc0ba41b58d6e49de)
@@ -107,30 +107,34 @@
      * @param request
      * @param response
      * @return
+     * @throws IOException 
      */
     public ActionForward setSubmissionDeadline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) {
+	    HttpServletResponse response) throws IOException {
 	IQaService qaService = getQAService();
 
 	Long contentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 	QaContent content = qaService.getQaContent(contentID);
 
 	Long dateParameter = WebUtil.readLongParam(request, QaAppConstants.ATTR_SUBMISSION_DEADLINE, true);
 	Date tzSubmissionDeadline = null;
+	String formattedDate = "";
 	if (dateParameter != null) {
 	    Date submissionDeadline = new Date(dateParameter);
 	    HttpSession ss = SessionManager.getSession();
 	    UserDTO teacher = (UserDTO) ss.getAttribute(AttributeNames.USER);
 	    TimeZone teacherTimeZone = teacher.getTimeZone();
 	    tzSubmissionDeadline = DateUtil.convertFromTimeZoneToDefault(teacherTimeZone, submissionDeadline);
-
+	    formattedDate = DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale());
 	} else {
 	    //set showOtherAnswersAfterDeadline to false
 	    content.setShowOtherAnswersAfterDeadline(false);
 	}
 	content.setSubmissionDeadline(tzSubmissionDeadline);
 	qaService.saveOrUpdateQaContent(content);
 
+	response.setContentType("text/plain;charset=utf-8");
+	response.getWriter().print(formattedDate);
 	return null;
     }
 
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java
===================================================================
diff -u -r70e7323be9b50d1e8c3902cde43cbe5039181541 -r31e6bbeab2ea68cd74d596bfc0ba41b58d6e49de
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java	(.../QaMonitoringStarterAction.java)	(revision 70e7323be9b50d1e8c3902cde43cbe5039181541)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java	(.../QaMonitoringStarterAction.java)	(revision 31e6bbeab2ea68cd74d596bfc0ba41b58d6e49de)
@@ -182,6 +182,8 @@
 	    TimeZone teacherTimeZone = teacher.getTimeZone();
 	    Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(teacherTimeZone, submissionDeadline);
 	    request.setAttribute(QaAppConstants.ATTR_SUBMISSION_DEADLINE, tzSubmissionDeadline.getTime());
+	    // use the unconverted time, as convertToStringForJSON() does the timezone conversion if needed
+	    request.setAttribute(QaAppConstants.ATTR_SUBMISSION_DEADLINE_DATESTRING, DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale()));
 	}
 
 	return (mapping.findForward(LOAD_MONITORING));
Index: lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp
===================================================================
diff -u -r6f53dcc0016b4e9c777dcf89595faf121a5da8c9 -r31e6bbeab2ea68cd74d596bfc0ba41b58d6e49de
--- lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 6f53dcc0016b4e9c777dcf89595faf121a5da8c9)
+++ lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 31e6bbeab2ea68cd74d596bfc0ba41b58d6e49de)
@@ -56,6 +56,7 @@
 		var submissionDeadlineSettings = {
 			lams: '${lams}',
 			submissionDeadline: '${submissionDeadline}',
+			submissionDateString: '${submissionDateString}',
 			setSubmissionDeadlineUrl: '<c:url value="/monitoring.do?dispatch=setSubmissionDeadline"/>',
 			toolContentID: '${content.qaContentId}',
 			messageNotification: '<fmt:message key="monitor.summary.notification" />',