diff --git a/src/main/java/org/gcube/portlets/user/notifications/server/NotificationsServiceImpl.java b/src/main/java/org/gcube/portlets/user/notifications/server/NotificationsServiceImpl.java
index 6f5a010..c20026c 100644
--- a/src/main/java/org/gcube/portlets/user/notifications/server/NotificationsServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/notifications/server/NotificationsServiceImpl.java
@@ -178,8 +178,10 @@ public class NotificationsServiceImpl extends RemoteServiceServlet implements No
 		Properties descriptions = getDescriptionsByType();
 
 		TreeMap<String, ArrayList<NotificationPreference>> treeMap = new TreeMap<String, ArrayList<NotificationPreference>>();
+		
 		try {
 			Map<NotificationType, NotificationChannelType[]> storePreferences = store.getUserNotificationPreferences(userid);
+		
 			for (NotificationType type : storePreferences.keySet()) {
 				String category = categories.getProperty(type.toString());
 				String typeLabel = labels.getProperty(type.toString());
diff --git a/src/main/webapp/conf/categorybytype.properties b/src/main/webapp/conf/categorybytype.properties
index 4785e40..a6f4e87 100644
--- a/src/main/webapp/conf/categorybytype.properties
+++ b/src/main/webapp/conf/categorybytype.properties
@@ -18,3 +18,6 @@ COMMENT=Social Networking
 MENTION=Social Networking
 LIKE=Social Networking
 MESSAGE=Social Networking
+CALENDAR_ADDED_EVENT=Shared Calendars
+CALENDAR_UPDATED_EVENT=Shared Calendars
+CALENDAR_DELETED_EVENT=Shared Calendars
\ No newline at end of file
diff --git a/src/main/webapp/conf/descbytype.properties b/src/main/webapp/conf/descbytype.properties
index 56e997d..57ada80 100644
--- a/src/main/webapp/conf/descbytype.properties
+++ b/src/main/webapp/conf/descbytype.properties
@@ -18,3 +18,6 @@ DOCUMENT_WORKFLOW_FIRST_STEP_REQUEST_INVOLVMENT=Someone involved you on his docu
 DOCUMENT_WORKFLOW_USER_FORWARD_TO_OWNER=A document workflow you created was forwarded to another step
 DOCUMENT_WORKFLOW_FORWARD_STEP_COMPLETED_OWNER=A document workflow you created was forwarded to the another step by all the users involved in the step
 DOCUMENT_WORKFLOW_STEP_FORWARD_PEER=Someone completed his task on a document workflow where you still need to do yours
+CALENDAR_ADDED_EVENT=Someone added a new event in one of your shared calendars
+CALENDAR_UPDATED_EVENT=Someone edited an event in one of your shared calendars
+CALENDAR_DELETED_EVENT=Someone deleted an event in one of your shared calendars
\ No newline at end of file
diff --git a/src/main/webapp/conf/labelbytype.properties b/src/main/webapp/conf/labelbytype.properties
index c6bc2db..37ba36a 100644
--- a/src/main/webapp/conf/labelbytype.properties
+++ b/src/main/webapp/conf/labelbytype.properties
@@ -11,6 +11,9 @@ COMMENT=Replies
 MENTION=Mentions
 LIKE=Favorites
 MESSAGE=Messages
+CALENDAR_ADDED_EVENT=New added events
+CALENDAR_UPDATED_EVENT=Edited events
+CALENDAR_DELETED_EVENT=Deleted events
 DOCUMENT_WORKFLOW_EDIT=Edit
 DOCUMENT_WORKFLOW_VIEW=View
 DOCUMENT_WORKFLOW_STEP_REQUEST_TASK=Task request