Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
===================================================================
diff -u -rbec136e7207405d99fa7f18e39a19bed555f0ee3 -r5333e76c1d4cb29cbce9546609f8da0cb596ddb6
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(.../GradebookService.java)	(revision bec136e7207405d99fa7f18e39a19bed555f0ee3)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(.../GradebookService.java)	(revision 5333e76c1d4cb29cbce9546609f8da0cb596ddb6)
@@ -210,10 +210,13 @@
 	int attemptOrder = 1;
 	List<GradebookUserActivityArchive> activityArchives = gradebookDAO.getArchivedActivityMarks(activityId, userId);
 	for (GradebookUserLessonArchive lessonArchive : lessonArchives) {
-	    GBActivityArchiveGridRowDTO activityDTO = new GBActivityArchiveGridRowDTO(attemptOrder,
-		    lessonArchive.getArchiveDate(), lessonArchive.getMark());
+	    Date archiveDate = lessonArchive.getArchiveDate();
+	    Date adjustedArchiveDate = userTimezone == null ? archiveDate
+		    : DateUtil.convertToTimeZoneFromDefault(userTimezone, archiveDate);
+	    GBActivityArchiveGridRowDTO activityDTO = new GBActivityArchiveGridRowDTO(attemptOrder, adjustedArchiveDate,
+		    lessonArchive.getMark());
 	    for (GradebookUserActivityArchive activityArchive : activityArchives) {
-		if (lessonArchive.getArchiveDate().equals(activityArchive.getArchiveDate())) {
+		if (archiveDate.equals(activityArchive.getArchiveDate())) {
 		    activityDTO.setMark(activityArchive.getMark());
 		    activityDTO.setFeedback(activityArchive.getFeedback());