diff --git a/app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/ConversationMessageAdapter.java b/app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/ConversationMessageAdapter.java
index 582b2b5..86d9c44 100644
--- a/app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/ConversationMessageAdapter.java
+++ b/app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/ConversationMessageAdapter.java
@@ -18,6 +18,7 @@ import org.communiquons.android.comunic.client.data.helpers.ImageLoadHelper;
 import org.communiquons.android.comunic.client.data.models.UserInfo;
 import org.communiquons.android.comunic.client.data.models.ConversationMessage;
 import org.communiquons.android.comunic.client.ui.utils.UiUtils;
+import org.communiquons.android.comunic.client.ui.views.WebUserAccountImage;
 
 import java.util.ArrayList;
 
@@ -97,7 +98,7 @@ public class ConversationMessageAdapter extends ArrayAdapter<ConversationMessage
                 findViewById(R.id.fragment_conversation_message_item_content);
         ImageView messageImageView = convertView.
                 findViewById(R.id.fragment_conversation_message_item_messageimage);
-        ImageView accountImageView;
+        WebUserAccountImage accountImageView;
         TextView userNameView = convertView.
                 findViewById(R.id.fragment_conversation_message_item_username);
 
@@ -217,18 +218,13 @@ public class ConversationMessageAdapter extends ArrayAdapter<ConversationMessage
         /*
             Update account image
          */
-        //Cancel any load pending operation
-        ImageLoadHelper.remove(accountImageView);
-
-        //Set the default image
-        accountImageView.setImageResource(R.drawable.default_account_image);
-        accountImageView.setVisibility(View.VISIBLE);
 
         //Check if we can load a specific image
         if(user != null) {
-            String imageURL = user.getAcountImageURL();
-            ImageLoadHelper.load(getContext(), imageURL, accountImageView);
+            accountImageView.setUser(user);
         }
+        else
+            accountImageView.removeUser();
 
 
         return convertView;
diff --git a/app/src/main/res/layout/fragment_conversation_message_item.xml b/app/src/main/res/layout/fragment_conversation_message_item.xml
index 8bdef36..5d0820d 100644
--- a/app/src/main/res/layout/fragment_conversation_message_item.xml
+++ b/app/src/main/res/layout/fragment_conversation_message_item.xml
@@ -23,7 +23,7 @@
         android:padding="5dp"
         android:background="@drawable/fragment_conversation_message_otheruser_bg">
 
-        <ImageView
+        <org.communiquons.android.comunic.client.ui.views.WebUserAccountImage
             android:id="@+id/fragment_conversation_message_item_left_account_image"
             android:layout_width="26dp"
             android:layout_height="26dp"
@@ -53,7 +53,7 @@
             tools:layout_height="40dp"
             tools:layout_width="40dp"/>
 
-        <ImageView
+        <org.communiquons.android.comunic.client.ui.views.WebUserAccountImage
             android:id="@+id/fragment_conversation_message_item_right_account_image"
             android:layout_width="26dp"
             android:layout_height="26dp"