diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/AvatarReplacement.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/AvatarReplacement.java
index 02e11b1..c58c9d5 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/AvatarReplacement.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/AvatarReplacement.java
@@ -2,8 +2,6 @@ package org.gcube.portlets.user.newsfeed.client.ui;
 
 import java.util.HashMap;
 
-import org.gcube.portlets.user.newsfeed.client.panels.NewsFeedPanel;
-
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/AvatarReplacement4Comments.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/AvatarReplacement4Comments.java
index 404d0a6..b377a0c 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/AvatarReplacement4Comments.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/AvatarReplacement4Comments.java
@@ -1,9 +1,5 @@
 package org.gcube.portlets.user.newsfeed.client.ui;
 
-import java.util.HashMap;
-
-import org.gcube.portlets.user.newsfeed.client.panels.NewsFeedPanel;
-
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java
index cd097af..319cae8 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java
@@ -321,7 +321,7 @@ public class TweetTemplate extends Composite {
 				vreSource.setHTML("<a class=\"link\" style=\"font-size: 10px; white-space: nowrap;\" href=\"/group/"+vreName.toLowerCase()+"\">[" +vreName + "]</a>");
 			} 
 			//check if the user has his own avatar
-			if (feed.getThumbnailURL().endsWith("img_id=0") || !feed.getThumbnailURL().contains("?")) { //it means no avatar is set
+			if (feed.getThumbnailURL().contains("img_id=0") || !feed.getThumbnailURL().contains("?")) { //it means no avatar is set
 				avatarImage.setVisible(false);
 				String f = "A";
 				String s = "Z";