Index: lams_central/src/java/org/lamsfoundation/lams/web/EmailForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/EmailForm.java,v
diff -u -r1.1 -r1.2
--- lams_central/src/java/org/lamsfoundation/lams/web/EmailForm.java	4 Jul 2013 11:35:29 -0000	1.1
+++ lams_central/src/java/org/lamsfoundation/lams/web/EmailForm.java	15 Jun 2015 14:41:47 -0000	1.2
@@ -39,6 +39,7 @@
     private Long userId;
 
     private String to;
+    private String ccEmail;
     private String subject;
     private String body;
 
@@ -57,6 +58,14 @@
     public void setTo(String name) {
 	this.to = name;
     }
+    
+    public void setCcEmail(String ccEmail) {
+	this.ccEmail = ccEmail;
+    }
+    
+    public String getCcEmail() {
+	return ccEmail;
+    }
 
     public String getSubject() {
 	return subject;
Index: lams_central/src/java/org/lamsfoundation/lams/web/EmailUserAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/EmailUserAction.java,v
diff -u -r1.2 -r1.3
--- lams_central/src/java/org/lamsfoundation/lams/web/EmailUserAction.java	4 Jul 2013 14:10:16 -0000	1.2
+++ lams_central/src/java/org/lamsfoundation/lams/web/EmailUserAction.java	15 Jun 2015 14:41:47 -0000	1.3
@@ -41,7 +41,9 @@
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.CentralConstants;
+import org.lamsfoundation.lams.util.Emailer;
 import org.lamsfoundation.lams.util.MessageService;
+import org.lamsfoundation.lams.util.ValidationUtil;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -106,8 +108,19 @@
 		    + " sent email to user ID " + userId + ": \n[subject] " + subject + "\n[message] " + body);
 	}
 
+	boolean IS_HTML_FORMAT = false;
 	getEventNotificationService().sendMessage(currentUser.getUserID(), userId.intValue(),
-		IEventNotificationService.DELIVERY_METHOD_MAIL, subject, body, false);
+		IEventNotificationService.DELIVERY_METHOD_MAIL, subject, body, IS_HTML_FORMAT);
+	
+	String ccEmail = emailForm.getCcEmail();
+	if (StringUtils.isNotBlank(ccEmail) && ValidationUtil.isEmailValid(ccEmail, false)) {
+	    Emailer.sendFromSupportEmail(subject, ccEmail, body, IS_HTML_FORMAT);
+	    
+	    if (EmailUserAction.log.isDebugEnabled()) {
+		EmailUserAction.log.debug("User " + currentUser.getLogin() + " (" + currentUser.getEmail() + ") "
+			+ " sent email to user ID " + userId + ": \n[subject] " + subject + "\n[message] " + body);
+	    }
+	}
 
 	return null;
     }
Index: lams_central/web/emailuser.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/emailuser.jsp,v
diff -u -r1.3 -r1.4
--- lams_central/web/emailuser.jsp	6 Apr 2014 22:56:46 -0000	1.3
+++ lams_central/web/emailuser.jsp	15 Jun 2015 14:41:47 -0000	1.4
@@ -20,17 +20,38 @@
 
 		input, textarea {
 			width: 100%;
-		}		
+		}
+		
+		input[type="checkbox"] {
+			width: 10px;
+			vertical-align: bottom;
+			margin-top: 5px;
+		}
+		
+		#cc-email-area {
+			display: none;
+		}
 		</style>
 	</lams:head>
 	
-	
+	<script type="text/javascript">
+		//constant for instantedit.js
+		var IS_AJAX_CALL_REQUIRED = false;
+	</script>
 	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="includes/javascript/jquery.form.js"></script>
+	<script type="text/javascript" src="includes/javascript/instantedit.js"></script>
 	<script type="text/javascript">
 		var returnUrl = '${param.returnUrl}';
 	
 		function sendEmail(){
+			
+			//prepare ccEmail parameter if available
+			if ($("#cc-email-enabled").prop('checked')) {
+				var ccEmail = encodeURI($("#cc-email-address").html());
+				$("#cc-email-hidden-input").val(ccEmail);
+			}
+			
 			$('#emailUserForm').ajaxSubmit({
 				'success' : function(result){
 					if (result) {
@@ -55,6 +76,20 @@
 				document.location.href = returnUrl; 
 			}
 		}
+		
+		$(document).ready(function(){
+			
+			//toggle cc email address 
+			$('#cc-email-enabled').click(function() {
+				$("#cc-email-area").toggle();
+			});
+			
+			$('#edit-email-address').click(function() {
+				editBox(document.getElementById( "cc-email-address" ));
+			});
+			
+		});
+		
 	</script>
 
 <body class="stripes">
@@ -78,15 +113,39 @@
 					<input type="hidden" name="userId" value="${user.userId}" />
 				</c:if>
 				<input type="hidden" name="lessonID" value="${param.lessonID}" />
+				<input type="hidden" name="ccEmail" id="cc-email-hidden-input" value="" />
 				
 				<table>
 					<tr>
-						<td><fmt:message key="email.to" /></td>
+						<td style="width: 30%;">
+							<fmt:message key="email.to" />
+						</td>
+						
 						 <c:if test="${not empty user}">
 							<td><c:out value="${user.firstName} ${user.lastName}"/> &lt;<c:out value="${user.email}"/>&gt;</td>
 						 </c:if>
 					</tr>
+					
+					<tr>
+						<td>
+							<input type="checkbox" name="ccEmailEnabled" id="cc-email-enabled"/>
+							<label for="cc-email-enabled">
+								Send me a copy
+							</label>
+						</td>
 
+							<td>
+							<div id="cc-email-area">
+								<span id="cc-email-address"><lams:user property="email"/></span>
+								<sup>
+									<a href="javascript:;" id="edit-email-address">
+										<fmt:message key="label.edit" />
+									</a>
+								</sup>
+							</div>
+							</td>						
+					</tr>
+
 					<tr>
 						<td class="small-space-top" ><fmt:message key="email.subject" /></td>
 						<td class="small-space-top"><input type="text" name="subject"
Index: lams_central/web/includes/javascript/instantedit.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/instantedit.js,v
diff -u -r1.1 -r1.2
--- lams_central/web/includes/javascript/instantedit.js	25 Mar 2013 12:04:10 -0000	1.1
+++ lams_central/web/includes/javascript/instantedit.js	15 Jun 2015 14:41:47 -0000	1.2
@@ -66,13 +66,22 @@
 var formVars = "";
 var changing = false;
 
+//**LAMS** added the following 3 lines 
+//Ajax call is required unless it was set to false in jsp
+if (typeof IS_AJAX_CALL_REQUIRED === 'undefined') {
+	var IS_AJAX_CALL_REQUIRED = true;
+}
 
 function fieldEnter(campo,evt,idfld) {
 	evt = (evt) ? evt : window.event;
 	if (evt.keyCode == 13 && campo.value!="") {
 		elem = document.getElementById( idfld );
-		remotos = new datosServidor;
-		nt = remotos.enviar(urlBase + "?fieldname=" +encodeURI(elem.id)+ "&content="+encodeURI(campo.value)+"&"+formVars,"");
+		
+		//**LAMS** added the following condition
+		if (IS_AJAX_CALL_REQUIRED) {
+			remotos = new datosServidor;
+			nt = remotos.enviar(urlBase + "?fieldname=" +encodeURI(elem.id)+ "&content="+encodeURI(campo.value)+"&"+formVars,"");
+		}
 		//remove glow
 		noLight(elem);
 		elem.innerHTML = campo.value;
@@ -88,8 +97,13 @@
 function fieldBlur(campo,idfld) {
 	if (campo.value!="") {
 		elem = document.getElementById( idfld );
-		remotos = new datosServidor;
-		nt = remotos.enviar(urlBase + "?fieldname=" +escape(elem.id)+ "&content="+escape(campo.value)+"&"+formVars,"");
+		
+		//**LAMS** added the following condition
+		if (IS_AJAX_CALL_REQUIRED) {
+			remotos = new datosServidor;
+			nt = remotos.enviar(urlBase + "?fieldname=" +escape(elem.id)+ "&content="+escape(campo.value)+"&"+formVars,"");
+		}
+		
 		elem.innerHTML = campo.value;
 		changing = false;
 		return false;
Index: lams_common/src/java/org/lamsfoundation/lams/util/ValidationUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/ValidationUtil.java,v
diff -u -r1.5 -r1.6
--- lams_common/src/java/org/lamsfoundation/lams/util/ValidationUtil.java	18 Apr 2014 22:51:59 -0000	1.5
+++ lams_common/src/java/org/lamsfoundation/lams/util/ValidationUtil.java	15 Jun 2015 14:41:48 -0000	1.6
@@ -68,12 +68,23 @@
     }
 
     /**
-     * Checks whether supplied email address is valid.
+     * Checks whether supplied email address is valid. It validates email only if USER_VALIDATION_REQUIRED_EMAIL LAMS configuration is ON.
      */
     public static boolean isEmailValid(String email) {
+	return isEmailValid(email, true);
+    }
+    
+    /**
+     * Checks whether supplied email address is valid.
+     * 
+     * @param email supplied email
+     * @param checkConfiguration whether it should take into account LAMS server configuration setting USER_VALIDATION_REQUIRED_EMAIL
+     * @return
+     */
+    public static boolean isEmailValid(String email, boolean checkConfiguration) {
 	
 	boolean isValidationRequired = Configuration.getAsBoolean(ConfigurationKeys.USER_VALIDATION_REQUIRED_EMAIL);
-	if (isValidationRequired) {
+	if (!checkConfiguration || checkConfiguration && isValidationRequired) {
 	    return ValidationUtil.isRegexMatches(ValidationUtil.REGEX_EMAIL, email);
 	}
 	return true;