diff --git a/distro/changelog.xml b/distro/changelog.xml
index 2630d8b..e7b5e66 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,8 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.portal.social-mail-servlet.2-1-1"
+		date="2017-02-03">
+		<Change>Minor refactor for comment replies</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portal.social-mail-servlet.2-1-0"
 		date="2016-08-31">
 		<Change>Added possibility to change poller time at runtime as well as to quit it by editing a property file in the server</Change>
diff --git a/pom.xml b/pom.xml
index 8b47c24..b958867 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 	<groupId>org.gcube.portal</groupId>
 	<artifactId>social-mail-servlet</artifactId>
 	<packaging>war</packaging>
-	<version>2.1.0-SNAPSHOT</version>
+	<version>2.1.1-SNAPSHOT</version>
 
 	<name>social-mail-servlet Webapp</name>
 	<description>This component read periodically email replies from user wanting to reply to a post via email</description>
diff --git a/src/main/java/org/gcube/portal/socialmail/PeriodicTask.java b/src/main/java/org/gcube/portal/socialmail/PeriodicTask.java
index 4fbf2b4..6d736c7 100644
--- a/src/main/java/org/gcube/portal/socialmail/PeriodicTask.java
+++ b/src/main/java/org/gcube/portal/socialmail/PeriodicTask.java
@@ -496,8 +496,9 @@ public class PeriodicTask implements Runnable {
 		Thread likesThread = new Thread(new LikeNotificationsThread(commentText, nm, favorites, feedOwnerId, comment.getKey()));
 		likesThread.start();
 
+		UserManager userManager = new LiferayUserManager();
 		//notify the other users who commented this post (excluding the ones above)
-		Thread commentsNotificationthread = new Thread(new CommentNotificationsThread(socialStore, fakeSession.getUsername(), comment.getFeedid(), commentText, nm, feedOwnerId, comment.getKey(), favorites));
+		Thread commentsNotificationthread = new Thread(new CommentNotificationsThread(socialStore, userManager, fakeSession.getUsername(), comment.getFeedid(), commentText, nm, feedOwnerId, comment.getKey(), favorites));
 		commentsNotificationthread.start();	
 	}
 	/**