Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
===================================================================
diff -u -r15e70deb1c79e4c3098eb11b84287bb31c8f64c9 -ra3549eb5e124fddc99947655db5cc3656f33449e
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java	(.../GBActivityGridRowDTO.java)	(revision 15e70deb1c79e4c3098eb11b84287bb31c8f64c9)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java	(.../GBActivityGridRowDTO.java)	(revision a3549eb5e124fddc99947655db5cc3656f33449e)
@@ -26,12 +26,12 @@
 import java.util.ArrayList;
 import java.util.Set;
 
-import org.apache.commons.lang.StringEscapeUtils;
 import org.lamsfoundation.lams.gradebook.util.GBGridView;
 import org.lamsfoundation.lams.gradebook.util.GradebookUtil;
 import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.learningdesign.CompetenceMapping;
 import org.lamsfoundation.lams.learningdesign.ToolActivity;
+import org.springframework.web.util.HtmlUtils;
 
 public class GBActivityGridRowDTO extends GradebookGridRowDTO {
 
@@ -64,11 +64,11 @@
 
 	    this.groupId = groupId;
 	    // If grouped acitivty, append group name
-	    this.rowName = StringEscapeUtils.escapeHtml(activity.getTitle()) + " (" + groupName + ")";
+	    this.rowName = HtmlUtils.htmlEscape(activity.getTitle()) + " (" + groupName + ")";
 	} else {
 	    this.id = activity.getActivityId().toString();
 
-	    this.rowName = StringEscapeUtils.escapeHtml(activity.getTitle());
+	    this.rowName = HtmlUtils.htmlEscape(activity.getTitle());
 	}
 
 	String competenceMappingsStr = "";
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
===================================================================
diff -u -rbcc7587bf9ecfad75c935702a8b53405a7b90a17 -ra3549eb5e124fddc99947655db5cc3656f33449e
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(.../GradebookService.java)	(revision bcc7587bf9ecfad75c935702a8b53405a7b90a17)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(.../GradebookService.java)	(revision a3549eb5e124fddc99947655db5cc3656f33449e)
@@ -1215,8 +1215,8 @@
 			}
 		    }
 		    String activityRowName = (groupName != null && groupId != null)
-			    ? StringEscapeUtils.escapeHtml(activity.getTitle()) + " (" + groupName + ")"
-			    : StringEscapeUtils.escapeHtml(activity.getTitle());
+			    ? activity.getTitle() + " (" + groupName + ")"
+			    : activity.getTitle();
 
 		    String startDate = (userDto.getStartDate() == null) ? ""
 			    : FileUtil.EXPORT_TO_SPREADSHEET_TITLE_DATE_FORMAT.format(userDto.getStartDate());