diff --git a/src/main/java/org/gcube/portal/invites/EmailNotification.java b/src/main/java/org/gcube/portal/invites/EmailNotification.java
deleted file mode 100644
index 8259278..0000000
--- a/src/main/java/org/gcube/portal/invites/EmailNotification.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package org.gcube.portal.invites;
-
-import java.util.Date;
-import java.util.Properties;
-
-import javax.mail.Address;
-import javax.mail.Message;
-import javax.mail.Session;
-import javax.mail.Transport;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
-
-import org.gcube.common.portal.PortalContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * A class for sending email
- * 
- * @author M. Assante
- *
- */
-public class EmailNotification {
-	/**
-	 * The sender of the email
-	 */
-	private String emailSender;
-
-	/**
-	 * The recipients of the email
-	 */
-	private String emailrecipients[];
-
-	/**
-	 * Email's subject
-	 */
-	private String emailSubject;
-
-	/**
-	 * Email's body message
-	 */
-	private String emailBody;
-	
-	private String portalName;
-
-	/** Logger */
-	private static Logger _log = LoggerFactory.getLogger(EmailNotification.class);	
-
-	/**
-	 * Class's constructor
-	 * 
-	 * @param sender 
-	 * @param recipients 
-	 * @param subject 
-	 * @param body 
-	 */
-	public EmailNotification(String sender, String recipients[], String subject, String body) {
-		this.emailSender = PortalContext.getConfiguration().getSenderEmail();
-		this.emailrecipients = recipients;
-		this.emailSubject = subject;
-		this.emailBody = body;
-		this.portalName = PortalContext.getConfiguration().getGatewayName();
-	}
-
-	public void sendEmail() {
-		Properties props = System.getProperties();
-		String mailServiceHost = "localhost";
-		props.put("mail.smtp.host", mailServiceHost);
-		String mailServicePort = "25";
-		props.put("mail.smtp.port", mailServicePort);
-		Session session = Session.getDefaultInstance(props, null);
-		session.setDebug(true);
-		Message mimeMessage = new MimeMessage(session);
-
-		try {
-			// EMAIL SENDER
-			Address from = new InternetAddress(emailSender, portalName);
-			mimeMessage.setHeader("Content-Type", "text/html; charset=UTF-8");
-			mimeMessage.setFrom(from);
-
-			// EMAIL RECIPIENTS
-			for (int i=0; i<emailrecipients.length; i++) {
-				Address address = new InternetAddress(emailrecipients[i]);
-				mimeMessage.addRecipient(Message.RecipientType.TO, address);
-
-			}
-
-			mimeMessage.setSubject(emailSubject);
-			// mimeMessage.setText(emailBody);
-			mimeMessage.setContent(emailBody, "text/html; charset=UTF-8");
-			mimeMessage.setSentDate(new Date());
-			Transport.send(mimeMessage);
-		} catch (Exception e) {
-			e.printStackTrace();
-			_log.error("Failed to send the email message.", e);
-		}
-	}
-	
-	
-}
-
-
diff --git a/src/main/java/org/gcube/portal/invites/InvitesManager.java b/src/main/java/org/gcube/portal/invites/InvitesManager.java
index 644177a..5c22aa6 100644
--- a/src/main/java/org/gcube/portal/invites/InvitesManager.java
+++ b/src/main/java/org/gcube/portal/invites/InvitesManager.java
@@ -18,6 +18,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.gcube.application.framework.core.session.ASLSession;
 import org.gcube.common.portal.PortalContext;
+import org.gcube.common.portal.mailing.EmailNotification;
 import org.gcube.portal.databook.server.DBCassandraAstyanaxImpl;
 import org.gcube.portal.databook.server.DatabookStore;
 import org.gcube.portal.databook.shared.Invite;
@@ -303,17 +304,10 @@ public class InvitesManager {
 		body.append("<br /><br />");
 		body.append("<b>" + scope+"</b>");
 		body.append("</p>");
-		body.append("<p>");
-		body.append("WARNING / LEGAL TEXT: This message is intended only for the use of the individual or entity to which it is addressed and may contain"+
-		" information which is privileged, confidential, proprietary, or exempt from disclosure under applicable law. " +
-		"If you are not the intended recipient or the person responsible for delivering the message to the intended recipient, you are strictly prohibited from disclosing, distributing, copying, or in any way using this message.");
-		body.append("</p>");
-		
+				
 		String[] allMails = new String[adminEmails.size()];
-
 		adminEmails.toArray(allMails);
-
-		EmailNotification mailToAdmin = new EmailNotification("no-reply@d4science.org", allMails , "[" + gatewayName + "] - Sent Invitation", body.toString());
+		EmailNotification mailToAdmin = new EmailNotification(allMails , "[" + gatewayName + "] - Sent Invitation", body.toString());
 
 		mailToAdmin.sendEmail();
 	}