diff --git a/app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/CommentsAdapter.java b/app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/CommentsAdapter.java
index 9793fc1..247c87e 100644
--- a/app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/CommentsAdapter.java
+++ b/app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/CommentsAdapter.java
@@ -13,6 +13,7 @@ import org.communiquons.android.comunic.client.R;
 import org.communiquons.android.comunic.client.data.models.Comment;
 import org.communiquons.android.comunic.client.data.models.UserInfo;
 import org.communiquons.android.comunic.client.ui.listeners.onPostUpdateListener;
+import org.communiquons.android.comunic.client.ui.views.ContentTextView;
 import org.communiquons.android.comunic.client.ui.views.EnlargeableWebImageView;
 import org.communiquons.android.comunic.client.ui.views.LikeButtonView;
 import org.communiquons.android.comunic.client.ui.views.WebUserAccountImage;
@@ -86,7 +87,7 @@ class CommentsAdapter extends ArrayAdapter<Comment> {
         }
 
         //Update comment content
-        ((TextView) view.findViewById(R.id.comment_text)).setText(comment.getContent());
+        ((ContentTextView) view.findViewById(R.id.comment_text)).setParsedText(comment.getContent());
 
         //Update comment image (if any)
         EnlargeableWebImageView commentImage = view.findViewById(R.id.comment_image);
diff --git a/app/src/main/res/layout/comment_item.xml b/app/src/main/res/layout/comment_item.xml
index 61b40f3..4029ec7 100644
--- a/app/src/main/res/layout/comment_item.xml
+++ b/app/src/main/res/layout/comment_item.xml
@@ -24,7 +24,7 @@
 
 
     <!-- Comment content -->
-    <TextView
+    <org.communiquons.android.comunic.client.ui.views.ContentTextView
         android:id="@+id/comment_text"
         style="@style/CommentText"
         android:layout_width="0dp"