Index: lams_common/src/java/org/lamsfoundation/lams/events/EventNotificationService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/events/EventNotificationService.java,v
diff -u -r1.7.2.11 -r1.7.2.12
--- lams_common/src/java/org/lamsfoundation/lams/events/EventNotificationService.java	20 Sep 2016 07:36:55 -0000	1.7.2.11
+++ lams_common/src/java/org/lamsfoundation/lams/events/EventNotificationService.java	23 Oct 2016 12:03:29 -0000	1.7.2.12
@@ -440,7 +440,7 @@
 	Event event = subscription.getEvent();
 	String subjectToSend = subject == null ? event.getSubject() : subject;
 	String messageToSend = message == null ? event.getMessage() : message;
-	notifyUser(subscription, subject, message, event.isHtmlFormat());
+	notifyUser(subscription, subjectToSend, messageToSend, event.isHtmlFormat());
 	if (subscription.getDeliveryMethod().lastOperationFailed(subscription)) {
 	    Event eventFailCopy = (Event) event.clone();
 	    eventFailCopy.setFailTime(new Date());