Index: lams_common/src/java/org/lamsfoundation/lams/events/EventNotificationService.java
===================================================================
diff -u -ra99e0164f6eab394d86d84c139a22e68641178e2 -r33e5241d6d942a59dbbb92d4a429275920db8687
--- lams_common/src/java/org/lamsfoundation/lams/events/EventNotificationService.java	(.../EventNotificationService.java)	(revision a99e0164f6eab394d86d84c139a22e68641178e2)
+++ lams_common/src/java/org/lamsfoundation/lams/events/EventNotificationService.java	(.../EventNotificationService.java)	(revision 33e5241d6d942a59dbbb92d4a429275920db8687)
@@ -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());