Index: lams_central/web/emailuser.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/emailuser.jsp,v
diff -u -r1.3.2.6 -r1.3.2.7
--- lams_central/web/emailuser.jsp	8 Nov 2016 04:19:54 -0000	1.3.2.6
+++ lams_central/web/emailuser.jsp	9 Dec 2016 17:47:09 -0000	1.3.2.7
@@ -55,10 +55,9 @@
 
 	function closeDialog() {
 		if (returnUrl == '') {
-			if (window.parent.closeEmailDialog) {
-				window.parent.closeEmailDialog();
-			} else if (closeEmailDialog) {
-				closeEmailDialog();
+			if (window.top.$("#dialogEmail").length > 0) {
+				//clicking the button is added in order to circumwent the problem with the issue with hiding dialog using window.top.$("#dialogEmail").modal('hide');
+				window.top.$("#dialogEmail .close").click();
 			} else {
 				// if this is a pop up, close it
 				close();
Index: lams_central/web/main.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/main.jsp,v
diff -u -r1.77.2.36 -r1.77.2.37
--- lams_central/web/main.jsp	29 Nov 2016 08:44:48 -0000	1.77.2.36
+++ lams_central/web/main.jsp	9 Dec 2016 17:47:09 -0000	1.77.2.37
@@ -83,9 +83,7 @@
 				PRIVATE_NOTIFICATIONS_READ_ALL_HINT : '<c:out value="${PRIVATE_NOTIFICATIONS_READ_ALL_HINT_VAR}" />',
 				MY_PROFILE : '<fmt:message key="index.myprofile" />',
 				REMOVE_ORG_FAVORITE : '<fmt:message key="label.remove.org.favorite"/>',
-				MARK_ORG_FAVORITE : '<fmt:message key="label.mark.org.favorite"/>',
-				EMAIL_TITLE : '<fmt:message key="label.email"/>',
-
+				MARK_ORG_FAVORITE : '<fmt:message key="label.mark.org.favorite"/>'
 			},
 			activeOrgId = <c:choose><c:when test="${empty lastVisitedOrganisationId}">null</c:when><c:otherwise>${lastVisitedOrganisationId}</c:otherwise></c:choose>;
 
Index: lams_central/web/includes/javascript/main.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/Attic/main.js,v
diff -u -r1.1.2.17 -r1.1.2.18
--- lams_central/web/includes/javascript/main.js	8 Dec 2016 14:36:07 -0000	1.1.2.17
+++ lams_central/web/includes/javascript/main.js	9 Dec 2016 17:47:09 -0000	1.1.2.18
@@ -615,31 +615,3 @@
 	}
 }
 
-
-function showEmailDialog(userId, lessonId){
-	var dialog = showDialog("dialogEmail", {
-		'autoOpen'  : true,
-		'height'    : Math.max(380, Math.min(700, $(window).height() - 30)),
-		'width'     : Math.max(380, Math.min(700, $(window).width() - 60)),
-		'modal'     : true,
-		'resizable' : true,
-		'title'     : LABELS.EMAIL_TITLE,
-		'open'      : function(){
-			autoRefreshBlocked = true;
-			var dialog = $(this);
-			// load contents after opening the dialog
-			$('iframe', dialog).attr('src',
-					LAMS_URL + 'emailUser.do?method=composeMail&lessonID=' + lessonId
-					+ '&userID=' + userId);
-		},
-		'close' : function(){
-			autoRefreshBlocked = false;
-			$(this).remove();
-		}
-	}, false, true);
-}
-
-
-function closeEmailDialog(){
-	$('#dialogEmail').modal('hide');
-}
\ No newline at end of file