Index: lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
===================================================================
diff -u -r0a60188d27bdb965b5bd1b989bd7ac83c622e0aa -r67dfbf3258ae491f495d918b8c397819ffed018f
--- lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java	(.../DisplayGroupAction.java)	(revision 0a60188d27bdb965b5bd1b989bd7ac83c622e0aa)
+++ lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java	(.../DisplayGroupAction.java)	(revision 67dfbf3258ae491f495d918b8c397819ffed018f)
@@ -176,13 +176,12 @@
 			+ "/findUserLessons.do?dispatch=getResults&courseID=" + org.getOrganisationId()
 			+ "&KeepThis=true&TB_iframe=true&height=400&width=600", "search-lesson thickbox"
 			+ org.getOrganisationId(), null, "index.searchlesson.tooltip"));
-		
+
 		// Adding course notifications links if enabled
-		if (org.getEnableCourseNotifications() && (contains(roles, Role.ROLE_GROUP_MANAGER) || contains(roles, Role.ROLE_MONITOR))) {
-		    moreLinks.add(new IndexLinkBean("index.emailnotifications", Configuration.get(ConfigurationKeys.SERVER_URL)
-			    + "/monitoring/emailNotifications.do?method=getCourseView&organisationID="
-			    + org.getOrganisationId() + "&KeepThis=true&TB_iframe=true&height=500&width=800",
-			    "course-notifications thickbox" + org.getOrganisationId(), null,
+		if (org.getEnableCourseNotifications()
+			&& (contains(roles, Role.ROLE_GROUP_MANAGER) || contains(roles, Role.ROLE_MONITOR))) {
+		    moreLinks.add(new IndexLinkBean("index.emailnotifications", "javascript:showNotificationsDialog("
+			    + org.getOrganisationId() + ",null)", "course-notifications", null,
 			    "index.emailnotifications.tooltip"));
 		}
 
@@ -356,11 +355,9 @@
 
 	    // Adding lesson notifications links if enabled
 	    if (isGroupManagerOrMonitor && bean.isEnableLessonNotifications()) {
-		String emailnotificationsUrl = Configuration.get(ConfigurationKeys.SERVER_URL)
-			+ "/monitoring/emailNotifications.do?method=getLessonView&lessonID=" + bean.getId()
-			+ "&KeepThis=true&TB_iframe=true&height=560&width=800";
-		lessonLinks.add(new IndexLinkBean("index.emailnotifications", emailnotificationsUrl,
-			"thickbox" + orgId, "mycourses-notifications-img", "index.emailnotifications.tooltip"));
+		lessonLinks.add(new IndexLinkBean("index.emailnotifications", "javascript:showNotificationsDialog(null,"
+			+ bean.getId() + ")", null, "mycourses-notifications-img",
+			"index.emailnotifications.tooltip"));
 	    }
 
 	    // Adding gradebook course monitor links if enabled
Index: lams_central/src/java/org/lamsfoundation/lams/web/EmailUserAction.java
===================================================================
diff -u -r1edbb81f16cedfcc1326e4eca6e520b5b48cbddc -r67dfbf3258ae491f495d918b8c397819ffed018f
--- lams_central/src/java/org/lamsfoundation/lams/web/EmailUserAction.java	(.../EmailUserAction.java)	(revision 1edbb81f16cedfcc1326e4eca6e520b5b48cbddc)
+++ lams_central/src/java/org/lamsfoundation/lams/web/EmailUserAction.java	(.../EmailUserAction.java)	(revision 67dfbf3258ae491f495d918b8c397819ffed018f)
@@ -169,7 +169,8 @@
 	    }
 	    if (!StringUtils.isBlank(orgId)) {
 		result = getUserManagementService().isUserInRole(currentUser.getUserID(), new Integer(orgId),
-			Role.MONITOR);
+			Role.MONITOR) || getUserManagementService().isUserInRole(currentUser.getUserID(), new Integer(orgId),
+				Role.GROUP_MANAGER);
 	    }
 	}
 
Index: lams_central/web/includes/javascript/groupDisplay.js
===================================================================
diff -u -r910872499b502ccfcae4f620bedb1fa7e1b991ad -r67dfbf3258ae491f495d918b8c397819ffed018f
--- lams_central/web/includes/javascript/groupDisplay.js	(.../groupDisplay.js)	(revision 910872499b502ccfcae4f620bedb1fa7e1b991ad)
+++ lams_central/web/includes/javascript/groupDisplay.js	(.../groupDisplay.js)	(revision 67dfbf3258ae491f495d918b8c397819ffed018f)
@@ -73,8 +73,10 @@
 						},
 						success: function(html) {
 							jQuery(courseBg).append(html);
-							// unregister and re-register thickbox for this group in order to avoid double
-							// registration of thickbox for existing elements (i.e. group 'add lesson' link)
+							// unregister and re-register thickbox for this
+							// group in order to avoid double
+							// registration of thickbox for existing elements
+							// (i.e. group 'add lesson' link)
 							$('a.thickbox'+jQuery(courseBg).attr("id")).unbind("click");
 							tb_init('a.thickbox'+jQuery(courseBg).attr("id"));
 						}
@@ -139,7 +141,8 @@
 						    var $originals = tr.children();
 						    var $helper = tr.clone();
 						    $helper.children().each(function(index) {
-						      // Set helper cell sizes to match the original sizes
+						      // Set helper cell sizes to match the original
+								// sizes
 						      $(this).width($originals.eq(index).width())
 						    });
 						    return $helper;
@@ -167,4 +170,38 @@
 						}
 					}).disableSelection();;
 				}
-	//-->				
\ No newline at end of file
+				
+				function showMonitorLessonDialog(lessonID){
+					$("#monitorDialog").dialog('option', 'lessonID', lessonID)
+										 .dialog('open');
+				}
+				
+				function showAddLessonDialog(orgID){
+					$("#addLessonDialog").dialog('option', 'orgID', orgID)
+										 .dialog('open');
+				}
+				
+				function showNotificationsDialog(organisationID, lessonID){
+					$("#notificationsDialog").dialog('option', {
+							'orgID' : organisationID,
+							'lessonID': lessonID
+						}).dialog('open');
+				}
+				
+				function closeAddLessonDialog(refresh) {
+					$('#addLessonFrame').attr('src', null);
+					// was the dialog just closed or a new lesson really added?
+					// if latter, refresh the list
+					$("#addLessonDialog").dialog('option', 'refresh', refresh ? true : false)
+										 .dialog('close');
+				}
+			
+				function closeMonitorLessonDialog(refresh) {
+					$('#monitorFrame').attr('src', null);
+					// was the dialog just closed or a new lesson really added?
+					// if latter, refresh the list
+					$("#monitorDialog").dialog('option', 'refresh', refresh ? true : false)
+										 .dialog('close');
+				}
+				
+	// -->
Index: lams_central/web/main.jsp
===================================================================
diff -u -re34e4f27264febfd215f34616a05f7d02294de85 -r67dfbf3258ae491f495d918b8c397819ffed018f
--- lams_central/web/main.jsp	(.../main.jsp)	(revision e34e4f27264febfd215f34616a05f7d02294de85)
+++ lams_central/web/main.jsp	(.../main.jsp)	(revision 67dfbf3258ae491f495d918b8c397819ffed018f)
@@ -51,30 +51,6 @@
 		<script language="JavaScript" type="text/javascript" src="includes/javascript/groupDisplay.js"></script>	
 	</c:if>
 	<script language="javascript" type="text/javascript">
-		function showMonitorLessonDialog(lessonID){
-			$("#monitorDialog").dialog('option', 'lessonID', lessonID)
-								 .dialog('open');
-		}
-		
-		function showAddLessonDialog(orgID){
-			$("#addLessonDialog").dialog('option', 'orgID', orgID)
-								 .dialog('open');
-		}
-		
-		function closeAddLessonDialog(refresh) {
-			$('#addLessonFrame').attr('src', null);
-			// was the dialog just closed or a new lesson really added? if latter, refresh the list
-			$("#addLessonDialog").dialog('option', 'refresh', refresh ? true : false)
-								 .dialog('close');
-		}
-	
-		function closeMonitorLessonDialog(refresh) {
-			$('#monitorFrame').attr('src', null);
-			// was the dialog just closed or a new lesson really added? if latter, refresh the list
-			$("#monitorDialog").dialog('option', 'refresh', refresh ? true : false)
-								 .dialog('close');
-		}
-		
 		<!--
 			jQuery(document).ready(function(){
 				<c:if test="${not empty collapsedOrgDTOs}">
@@ -153,6 +129,33 @@
  						}
  					}
  				}).closest('.ui-dialog').children('.ui-dialog-titlebar').remove();
+				
+				// initialise notifications dialog
+				$('#notificationsDialog').dialog({
+ 					'autoOpen'  : false,
+ 					'height'    : 600,
+ 					'width'     : 850,
+ 					'modal'     : true,
+ 					'resizable' : false,
+ 					'hide'      : 'fold',
+ 					'title'     : "<fmt:message key='index.emailnotifications' />",
+ 					'open'      : function(){
+ 						var lessonID = $(this).dialog('option', 'lessonID');
+ 						// if lesson ID is given, use lesson view; otherwise use course view
+ 						if (lessonID) {
+	 						// load contents after opening the dialog
+	 						$('#notificationsFrame').attr('src', '<lams:LAMSURL/>monitoring/emailNotifications.do?method=getLessonView&lessonID='
+	 							+ lessonID);
+ 						} else {
+ 							var orgID = $(this).dialog('option', 'orgID');
+ 							$('#notificationsFrame').attr('src', '<lams:LAMSURL/>monitoring/emailNotifications.do?method=getCourseView&organisationID='
+			                	+ orgID);
+ 						}
+ 					},
+ 					'close' : function() {
+ 						$('#notificationsFrame').attr('src',null);
+ 					}
+ 				});
 			});
 		
 			function removeLesson(lessonID) {
@@ -340,6 +343,9 @@
 <div id="monitorDialog" class="dialogContainer">
 	<iframe id="monitorFrame"></iframe>
 </div>
+<div id="notificationsDialog" class="dialogContainer">
+	<iframe id="notificationsFrame"></iframe>
+</div>
 
 </body>
 </lams:html>
\ No newline at end of file
Index: lams_monitoring/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r1edbb81f16cedfcc1326e4eca6e520b5b48cbddc -r67dfbf3258ae491f495d918b8c397819ffed018f
--- lams_monitoring/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 1edbb81f16cedfcc1326e4eca6e520b5b48cbddc)
+++ lams_monitoring/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 67dfbf3258ae491f495d918b8c397819ffed018f)
@@ -153,6 +153,7 @@
 advanced.tab.form.time.limits.label  =Time limitations
 advanced.tab.form.enter.number.days.label  =Number days:
 advanced.tab.form.individual.not.entire.group.label  =Is this time limit for each individual?
+email.notifications =Notifications
 email.notifications.notify.sudents.that  =Notify students that:
 email.notifications.lesson.notifications  =Lesson notifications: {0}
 email.notifications.course.notifications  =Course notifications: {0}
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
===================================================================
diff -u -r27f47ef2e914561477b1fc5e8cf3f72cd01b1001 -r67dfbf3258ae491f495d918b8c397819ffed018f
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision 27f47ef2e914561477b1fc5e8cf3f72cd01b1001)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision 67dfbf3258ae491f495d918b8c397819ffed018f)
@@ -1190,6 +1190,11 @@
 	    }
 	}
 
+
+	IUserManagementService userManagementService = MonitoringServiceProxy.getUserManagementService(getServlet()
+		.getServletContext());
+	Organisation organisation = (Organisation) userManagementService.findById(Organisation.class, lessonDTO.getOrganisationID());
+	request.setAttribute("notificationsAvailable", organisation.getEnableCourseNotifications());
 	request.setAttribute("lesson", lessonDTO);
 	return mapping.findForward("monitorLesson");
     }
Index: lams_monitoring/web/emailnotifications/lessonNotifications.jsp
===================================================================
diff -u -r53a14ad800e0d596939e9f6c83e2f79e82def267 -r67dfbf3258ae491f495d918b8c397819ffed018f
--- lams_monitoring/web/emailnotifications/lessonNotifications.jsp	(.../lessonNotifications.jsp)	(revision 53a14ad800e0d596939e9f6c83e2f79e82def267)
+++ lams_monitoring/web/emailnotifications/lessonNotifications.jsp	(.../lessonNotifications.jsp)	(revision 67dfbf3258ae491f495d918b8c397819ffed018f)
@@ -48,7 +48,6 @@
 	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.jqGrid.js"></script>
 	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.jstepper.min.js"></script>
 	<script language="JavaScript" type="text/javascript">
-	<!--
 		jQuery(document).ready(function() {
 			
 			//initialize user list 
Index: lams_monitoring/web/includes/javascript/monitorLesson.js
===================================================================
diff -u -r1edbb81f16cedfcc1326e4eca6e520b5b48cbddc -r67dfbf3258ae491f495d918b8c397819ffed018f
--- lams_monitoring/web/includes/javascript/monitorLesson.js	(.../monitorLesson.js)	(revision 1edbb81f16cedfcc1326e4eca6e520b5b48cbddc)
+++ lams_monitoring/web/includes/javascript/monitorLesson.js	(.../monitorLesson.js)	(revision 67dfbf3258ae491f495d918b8c397819ffed018f)
@@ -175,8 +175,8 @@
 		'show'      : 'fold',
 		'hide'      : 'fold',
 		'open'      : function(){
-			$('#emailFrame').attr('src', LAMS_URL + 'emailUser.do?method=composeMail&lessonID='
-					+ lessonId
+			$('#emailFrame').attr('src',
+					LAMS_URL + 'emailUser.do?method=composeMail&lessonID=' + lessonId
 					+ '&userID=' + $(this).dialog('option', 'userId'));
 		}
 	});
@@ -482,8 +482,9 @@
 			            		var selectedLearner = $('#learnerGroupList div.dialogListItemSelected');
 			            		if (selectedLearner.length == 1) {
 			            			$('#emailDialog').dialog('option',{
-				            				'title'  : 'Email user',
-				            				'userId' : selectedLearner.attr('userId') 
+				            				'title'         : EMAIL_BUTTON_LABEL,
+				            				'userId'        : selectedLearner.attr('userId'),
+				            				'dialogContent' : 'email'
 				            			})
 				            			.dialog('open');
 			            		}
Index: lams_monitoring/web/monitor.jsp
===================================================================
diff -u -r1edbb81f16cedfcc1326e4eca6e520b5b48cbddc -r67dfbf3258ae491f495d918b8c397819ffed018f
--- lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision 1edbb81f16cedfcc1326e4eca6e520b5b48cbddc)
+++ lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision 67dfbf3258ae491f495d918b8c397819ffed018f)
@@ -41,6 +41,7 @@
 		var VIEW_LEARNER_BUTTON_LABEL = '<fmt:message key="button.view.learner"/>';
 		var EMAIL_BUTTON_LABEL = '<fmt:message key="button.email"/>';
 		var CLOSE_BUTTON_LABEL = '<fmt:message key="button.close"/>';
+		var NOTIFCATIONS_LABEL = '<fmt:message key="email.notifications"/>';
 		var LEARNER_FINISHED_COUNT_LABEL = '<fmt:message key="learner.finished.count"/>';
 		var LEARNER_FINISHED_DIALOG_TITLE_LABEL = '<fmt:message key="learner.finished.dialog.title"/>';
 		var LESSON_PRESENCE_ENABLE_ALERT_LABEL = '<fmt:message key="lesson.enable.presence.alert"/>';
@@ -168,6 +169,13 @@
 					   title='<fmt:message key="button.edit.class.tooltip"/>'>
 					   <fmt:message key="button.edit.class"/>
 					</a>
+					<c:if test="${notificationsAvailable}">
+						<a class="button lessonManageField" href="#"
+						   onClick="javascript:window.parent.showNotificationsDialog(null,${lesson.lessonID})">
+						   <fmt:message key="email.notifications"/>
+						</a>
+					</c:if>
+					
 					<a id="openImButton" class="button" href="#"
 					   onClick="javascript:openChatWindow()"
 						<c:if test="${not lesson.learnerImAvailable}">