diff --git a/src/main/java/org/gcube/applicationsupportlayer/social/mailing/EmailPlugin.java b/src/main/java/org/gcube/applicationsupportlayer/social/mailing/EmailPlugin.java
index d0c2037..2456c2e 100644
--- a/src/main/java/org/gcube/applicationsupportlayer/social/mailing/EmailPlugin.java
+++ b/src/main/java/org/gcube/applicationsupportlayer/social/mailing/EmailPlugin.java
@@ -127,55 +127,55 @@ public class EmailPlugin {
 	private static String getSubjectByNotificationType(Notification notification2Save, String portalURL, String vreName) {
 		switch (notification2Save.getType()) {
 		case LIKE:
-			return "Like on your post notification";
+			return "Like on your post";
 		case COMMENT:
-			return "Reply on a post notification";
+			return "Reply on a post";
 		case MESSAGE:
-			return "New message notification";
+			return "New message";
 		case WP_FOLDER_ADDEDUSER:
-			return "New user in a shared folder notification";
+			return "New user in a shared folder";
 		case WP_FOLDER_REMOVEDUSER:
-			return "Removed user in a shared folder notification";
+			return "Removed user in a shared folder";
 		case WP_FOLDER_SHARE:
 			return "Folder sharing notification";
 		case WP_ITEM_NEW:
-			return "New item in a shared folder notification";
+			return "New item in a shared folder";
 		case WP_ITEM_DELETE:
-			return "Deleted item in a shared folder notification";
+			return "Deleted item in a shared folder";
 		case WP_ITEM_UPDATED:
-			return "Updated item in a shared folder notification";
+			return "Updated item in a shared folder";
 		case OWN_COMMENT:
-			return "Reply on your post notification";
+			return "Reply on your post";
 		case MENTION:
-			return "Mention in a post notification";
+			return "Mention in a post";
 		case POST_ALERT:
-			return "Important post shared notification";
+			return "Important post shared";
 		case REQUEST_CONNECTION:
-			return "Connection request notification";
+			return "Connection request";
 		case JOB_COMPLETED_NOK:
-			return "Job Completed notification";
+			return "Job Completed";
 		case JOB_COMPLETED_OK:
-			return "Job Completed notification";
+			return "Job Completed";
 		case DOCUMENT_WORKFLOW_EDIT:
-			return "Shared document workflow view notification";
+			return "Shared document workflow view";
 		case DOCUMENT_WORKFLOW_VIEW:
-			return "Shared document workflow view notification";
+			return "Shared document workflow view";
 		case DOCUMENT_WORKFLOW_STEP_REQUEST_TASK:
-			return vreName +": Request for task notification";
+			return vreName +": Request for task";
 		case DOCUMENT_WORKFLOW_FIRST_STEP_REQUEST_INVOLVMENT:
-			return vreName +": Request for task notification";
+			return vreName +": Request for task";
 		case DOCUMENT_WORKFLOW_USER_FORWARD_TO_OWNER:
-			return vreName +": Document workflow forward notification";
+			return vreName +": Document workflow forward";
 		case DOCUMENT_WORKFLOW_STEP_FORWARD_PEER:
 			return vreName +": Done task notification";
 		case DOCUMENT_WORKFLOW_FORWARD_STEP_COMPLETED_OWNER:
-			return vreName +": Document workflow step completion notification";
+			return vreName +": Document workflow step completion";
 		case CALENDAR_ADDED_EVENT:
-			return vreName +": New event in a shared calendar notification";
+			return vreName +": New event in a shared calendar";
 		case CALENDAR_UPDATED_EVENT:
-			return vreName +": Edited event in a shared calendar notification";
+			return vreName +": Edited event in a shared calendar";
 		case CALENDAR_DELETED_EVENT:
-			return vreName +": Deleted in a shared calendar notification";
+			return vreName +": Deleted in a shared calendar";
 		default:
 			return "You have a new Notification";
 		}