diff --git a/app/src/main/java/crux/bphc/cms/adapters/delegates/CourseSectionDelegate.kt b/app/src/main/java/crux/bphc/cms/adapters/delegates/CourseSectionDelegate.kt
index 6379875e..c961517c 100644
--- a/app/src/main/java/crux/bphc/cms/adapters/delegates/CourseSectionDelegate.kt
+++ b/app/src/main/java/crux/bphc/cms/adapters/delegates/CourseSectionDelegate.kt
@@ -38,7 +38,7 @@ class CourseSectionDelegate(activity: Activity) : AdapterDelegate<List<CourseCon
         val vh = holder as CourseSectionViewHolder
         val section = items[position] as CourseSection
         vh.sectionName.text = section.name
-        val summary = Utils.trimWhiteSpace(HtmlCompat.fromHtml(section.summary.trim { it <= ' ' },
+        val summary = Utils.trimWhiteSpace(HtmlCompat.fromHtml(section.summary,
                 HtmlCompat.FROM_HTML_MODE_COMPACT))
         if (summary.isNotEmpty()) {
             vh.sectionDescription.visibility = View.VISIBLE
diff --git a/app/src/main/java/crux/bphc/cms/fragments/DiscussionFragment.kt b/app/src/main/java/crux/bphc/cms/fragments/DiscussionFragment.kt
index 13b4ae22..28f48d73 100644
--- a/app/src/main/java/crux/bphc/cms/fragments/DiscussionFragment.kt
+++ b/app/src/main/java/crux/bphc/cms/fragments/DiscussionFragment.kt
@@ -2,7 +2,6 @@ package crux.bphc.cms.fragments
 
 import android.os.Bundle
 import android.text.method.LinkMovementMethod
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -24,9 +23,9 @@ import crux.bphc.cms.helper.CourseRequestHandler
 import crux.bphc.cms.models.forum.Attachment
 import crux.bphc.cms.models.forum.Discussion
 import crux.bphc.cms.utils.Utils
+import crux.bphc.cms.widgets.HtmlTextView
 import crux.bphc.cms.widgets.PropertiesAlertDialog
 import io.realm.Realm
-import io.realm.RealmList
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -92,7 +91,7 @@ class DiscussionFragment : Fragment() {
         binding.subject.text = discussion.subject
         binding.userName.text = discussion.userFullName
         binding.modifiedTime.text = Utils.formatDate(discussion.timeModified)
-        binding.message.text = discussion.message
+        binding.message.text = HtmlTextView.parseHtml(discussion.message)
         Glide.with(requireContext())
             .load(Urls.getProfilePicUrl(discussion.userPictureUrl))
             .into(binding.userPic)
diff --git a/app/src/main/java/crux/bphc/cms/fragments/ForumFragment.kt b/app/src/main/java/crux/bphc/cms/fragments/ForumFragment.kt
index 6eeddbf1..d7171ca8 100644
--- a/app/src/main/java/crux/bphc/cms/fragments/ForumFragment.kt
+++ b/app/src/main/java/crux/bphc/cms/fragments/ForumFragment.kt
@@ -19,6 +19,7 @@ import crux.bphc.cms.helper.CourseRequestHandler
 import crux.bphc.cms.interfaces.ClickListener
 import crux.bphc.cms.models.forum.Discussion
 import crux.bphc.cms.utils.Utils
+import crux.bphc.cms.widgets.HtmlTextView
 import io.realm.Realm
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -185,7 +186,7 @@ class ForumFragment : Fragment() {
 
                 itemBinding.subject.text = discussion.subject
                 itemBinding.userName.text = discussion.userFullName
-                itemBinding.message.text = discussion.message
+                itemBinding.message.text = HtmlTextView.parseHtml(discussion.message)
                 itemBinding.modifiedTime.text = Utils.formatDate(discussion.timeModified)
 
                 if (!discussion.isPinned) {