Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java,v
diff -u -r1.53.2.20 -r1.53.2.21
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	11 May 2016 07:36:00 -0000	1.53.2.20
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	25 Jun 2016 02:40:56 -0000	1.53.2.21
@@ -1097,8 +1097,10 @@
 	}
 
 	DateFormat dateFormatter = new SimpleDateFormat(DateUtil.PRETTY_FORMAT);
+	dateFormatter.setTimeZone(userTimeZone);
 	// setting date format to ISO8601 for jquery.timeago
 	DateFormat dateFormatterTimeAgo = new SimpleDateFormat(DateUtil.ISO8601_FORMAT);
+	dateFormatterTimeAgo.setTimeZone(TimeZone.getTimeZone("GMT"));
 	for (QaUsrResp response : responses) {
 	    QaQueUsr user = response.getQaQueUser();
 
@@ -1114,11 +1116,12 @@
 	    responseRow.put("userName", StringEscapeUtils.escapeCsv(user.getFullname()));
 	    responseRow.put("visible", new Boolean(response.isVisible()).toString());
 
-	    // format attemptTime
+	    // format attemptTime - got straight from server time to other timezones in formatter
+	    // as trying to convert dates runs into tz issues - any Date object created is still
+	    // in the server time zone.
 	    Date attemptTime = response.getAttemptTime();
-	    attemptTime = DateUtil.convertToTimeZoneFromDefault(userTimeZone, attemptTime);
 	    responseRow.put("attemptTime", dateFormatter.format(attemptTime));
-	    responseRow.put("timeAgo", dateFormatterTimeAgo.format(attemptTime));
+	    responseRow.put("timeAgo", dateFormatterTimeAgo.format(attemptTime)); 
 
 	    if (isAllowRateAnswers) {
 
Index: lams_tool_sbmt/web/WEB-INF/tags/Date.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/tags/Date.tag,v
diff -u -r1.4 -r1.4.2.1
--- lams_tool_sbmt/web/WEB-INF/tags/Date.tag	6 May 2014 19:59:16 -0000	1.4
+++ lams_tool_sbmt/web/WEB-INF/tags/Date.tag	25 Jun 2016 02:41:49 -0000	1.4.2.1
@@ -34,6 +34,7 @@
 <%@ attribute name="value" required="true" rtexprvalue="true" type="java.util.Date" %>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="type" required="false" rtexprvalue="true"%>
+<%@ attribute name="timeago" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-core" prefix="c" %>
@@ -42,6 +43,10 @@
 	<c:set var="type" value="both" scope="request"/>
 </c:if>
 
+<c:if test="${not empty timeago}">
+	<time class="timeago" datetime="<fmt:formatDate value='${value}' timeZone="GMT" pattern="yyyy-MM-dd'T'HH:mm:ss.S'Z'"/>">
+</c:if>
+	
 <c:choose>
 	<c:when test="${style=='short'}">
 		<fmt:formatDate value="${value}" type="${type}" dateStyle="short" timeStyle="short" />
@@ -53,3 +58,7 @@
 		<fmt:formatDate value="${value}" type="${type}" dateStyle="long" timeStyle="medium" />
 	</c:otherwise>
 </c:choose>
+
+<c:if test="${not empty timeago}">
+	</time>
+</c:if>
\ No newline at end of file
Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/learner/sbmtlearner.jsp,v
diff -u -r1.35.2.4 -r1.35.2.5
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	24 May 2016 07:23:37 -0000	1.35.2.4
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	25 Jun 2016 02:41:49 -0000	1.35.2.5
@@ -147,9 +147,7 @@
 						<!--Third row displaying the date of submission of the File -->
 						<td><fmt:message key="label.learner.time" /></td>
 						<td colspan="2">
-							<time class="timeago" datetime="${file.dateOfSubmission}">
-								<lams:Date value='${file.dateOfSubmission}' />
-							</time>
+							<lams:Date value="${file.dateOfSubmission}" timeago="true"/>
 						</td>
 					</tr>