diff --git a/frontend/components.d.ts b/frontend/components.d.ts
index 5372e6dc..237a4b84 100644
--- a/frontend/components.d.ts
+++ b/frontend/components.d.ts
@@ -14,7 +14,6 @@ declare module 'vue' {
     AppSidebar: (typeof import('./src/components/AppSidebar.vue'))['default']
     ArchivedTeams: (typeof import('./src/components/Settings/ArchivedTeams.vue'))['default']
     AssignUser: (typeof import('./src/components/AssignUser.vue'))['default']
-    Bookmarks: (typeof import('./src/components/Settings/Bookmarks.vue'))['default']
     ChevronTriangle: (typeof import('./src/components/icons/ChevronTriangle.vue'))['default']
     ColorPicker: (typeof import('./src/components/ColorPicker.vue'))['default']
     CommandPalette: (typeof import('./src/components/CommandPalette/CommandPalette.vue'))['default']
diff --git a/frontend/src/components/Activity.vue b/frontend/src/components/Activity.vue
index fa8f93c1..dcbef03c 100644
--- a/frontend/src/components/Activity.vue
+++ b/frontend/src/components/Activity.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="relative flex items-center text-base">
+  <div class="relative flex items-center text-p-base">
     <div
       class="mr-3 grid h-7 w-7 shrink-0 place-items-center rounded-full bg-surface-gray-2 text-ink-gray-9"
     >
@@ -12,7 +12,10 @@
     </div>
     <p>
       <UserInfo :email="activity.user" v-slot="{ user }">
-        <UserProfileLink class="font-medium text-ink-gray-8 hover:text-ink-gray-5" :user="user.name">
+        <UserProfileLink
+          class="font-medium text-ink-gray-8 hover:text-ink-gray-5"
+          :user="user.name"
+        >
           {{ user.full_name }}
         </UserProfileLink>
       </UserInfo>
diff --git a/frontend/src/components/Comment.vue b/frontend/src/components/Comment.vue
index e25a5105..ecdeef28 100644
--- a/frontend/src/components/Comment.vue
+++ b/frontend/src/components/Comment.vue
@@ -8,7 +8,7 @@
   >
     <UserInfo :email="comment.owner" v-slot="{ user }">
       <div
-        class="flex items-center text-base text-ink-gray-9 sticky top-0 pt-16 pb-4 bg-surface-white z-[1]"
+        class="flex items-center text-base text-ink-gray-9 sticky top-0 pt-14 pb-2 bg-surface-white z-[1]"
       >
         <UserProfileLink class="mr-3" :user="user.name">
           <UserAvatar size="lg" :user="user.name" />
diff --git a/frontend/src/components/CommentsArea.vue b/frontend/src/components/CommentsArea.vue
index 875bf89d..a06c31b3 100644
--- a/frontend/src/components/CommentsArea.vue
+++ b/frontend/src/components/CommentsArea.vue
@@ -19,7 +19,7 @@
         </div>
       </div>
     </div>
-    <div class="px-1" :style="{ paddingBottom: `${addCommentHeight + 80}px` }">
+    <div :style="{ paddingBottom: `${addCommentHeight + 80}px` }">
       <template v-for="item in timelineItems" :key="item.doctype + item.name">
         <div
           v-if="newMessagesFrom && newMessagesFrom == item.name"
@@ -62,7 +62,7 @@
 
     <div
       v-if="!readOnlyMode && !disableNewComment"
-      class="fixed bottom-12 mb-px mt-2 w-full max-w-3xl bg-surface-white py-4 pr-12 sm:bottom-0 standalone:bottom-16"
+      class="fixed z-[2] bottom-12 left-0 sm:left-auto px-4 sm:px-0 mb-px mt-2 w-full sm:max-w-3xl bg-surface-white py-3 sm:bottom-[-1px] standalone:bottom-16"
       ref="addComment"
     >
       <button
@@ -80,7 +80,7 @@
         @keydown.meta.enter.capture.stop="submitComment"
       >
         <div class="mb-4 flex items-center">
-          <UserAvatar :user="$user().name" size="sm" />
+          <UserAvatar :user="$user().name" size="md" />
           <span class="ml-2 text-base font-medium text-ink-gray-9">
             {{ $user().full_name }}
           </span>
@@ -105,7 +105,7 @@
             onClick: discardComment,
           }"
           :editable="showCommentBox"
-          placeholder="Add a comment"
+          placeholder="Add a comment..."
         />
         <PollEditor
           v-show="newCommentType == 'Poll'"
diff --git a/frontend/src/components/DiscussionView.vue b/frontend/src/components/DiscussionView.vue
index de17a1b1..7d72227e 100644
--- a/frontend/src/components/DiscussionView.vue
+++ b/frontend/src/components/DiscussionView.vue
@@ -2,9 +2,9 @@
   <div class="relative flex h-full flex-col" v-if="postId && discussion">
     <div class="mx-auto w-full max-w-3xl">
       <div class="pb-16">
-        <div class="pb-4 pt-16 flex w-full items-center sticky top-0 z-[1] bg-surface-white">
+        <div class="pb-2 pt-14 flex w-full items-center sticky top-0 z-[1] bg-surface-white">
           <UserProfileLink class="mr-3" :user="discussion.owner">
-            <UserAvatar :user="discussion.owner" />
+            <UserAvatar size="lg" :user="discussion.owner" />
           </UserProfileLink>
           <div class="flex flex-col md:block">
             <UserProfileLink
@@ -36,39 +36,9 @@
             />
           </div>
         </div>
-        <div class="pb-4">
+        <div :class="{ 'pb-4 mt-1': !editingPost }">
           <div class="flex items-start justify-between space-x-1">
-            <div v-if="editingTitle" class="w-full">
-              <div class="mb-2">
-                <input
-                  v-if="editingTitle"
-                  type="text"
-                  class="w-full rounded border-0 bg-surface-gray-2 text-ink-gray-9 px-2 py-1 text-xl font-semibold focus:ring-0"
-                  ref="title"
-                  v-model="discussion.title"
-                  placeholder="Title"
-                  @keydown.enter="
-                    () => {
-                      $resources.discussion.setValue
-                        .submit({ title: discussion.title })
-                        .then(() => this.updateUrlSlug())
-                      editingTitle = false
-                    }
-                  "
-                  @keydown.esc="
-                    () => {
-                      $resources.discussion.reload()
-                      editingTitle = false
-                    }
-                  "
-                  v-focus
-                />
-                <p class="mt-1 text-sm text-ink-gray-5">
-                  Edit title and press enter. Press escape to cancel.
-                </p>
-              </div>
-            </div>
-            <h1 v-else class="flex items-center text-2xl font-semibold">
+            <h1 v-if="!editingPost" class="flex items-center text-2xl font-semibold">
               <Tooltip v-if="discussion.closed_at" text="This discussion is closed">
                 <LucideLock class="mr-2 h-4 w-4 text-ink-gray-7" :stroke-width="2" />
               </Tooltip>
@@ -77,7 +47,7 @@
               </span>
             </h1>
           </div>
-          <div class="mt-2 flex items-center text-base" v-show="!editingTitle">
+          <div class="mt-2 flex items-center text-base" v-show="!editingPost">
             <DiscussionBreadcrumbs :discussion="discussion" />
             <span class="px-1.5 text-ink-gray-8">&middot;</span>
             <span class="text-ink-gray-5">
@@ -91,9 +61,22 @@
         </div>
         <div
           :class="{
-            'rounded-lg border p-4 focus-within:border-outline-gray-3': editingContent,
+            'rounded-lg border p-4 focus-within:border-outline-gray-3': editingPost,
           }"
         >
+          <div v-if="editingPost" class="w-full">
+            <div class="mb-2">
+              <input
+                v-if="editingPost"
+                type="text"
+                class="w-full rounded border-0 text-ink-gray-9 px-0 py-0.5 text-2xl font-semibold focus:ring-0"
+                ref="title"
+                v-model="discussion.title"
+                placeholder="Title"
+                v-focus
+              />
+            </div>
+          </div>
           <CommentEditor
             :value="discussion.content"
             @change="discussion.content = $event"
@@ -101,19 +84,20 @@
               variant: 'solid',
               onClick: () => {
                 $resources.discussion.setValue.submit({
+                  title: discussion.title,
                   content: discussion.content,
                 })
-                editingContent = false
+                editingPost = false
               },
               loading: $resources.discussion.setValue.loading,
             }"
             :discardButtonProps="{
               onClick: () => {
-                editingContent = false
+                editingPost = false
                 $resources.discussion.reload()
               },
             }"
-            :editable="editingContent"
+            :editable="editingPost"
           />
         </div>
         <div class="mt-3">
@@ -228,6 +212,8 @@ export default {
           reopenDiscussion: 'reopen_discussion',
           pinDiscussion: 'pin_discussion',
           unpinDiscussion: 'unpin_discussion',
+          addBookmark: 'add_bookmark',
+          removeBookmark: 'remove_bookmark',
           moveToProject: {
             method: 'move_to_project',
             validate(params) {
@@ -268,43 +254,19 @@ export default {
         },
       }
     },
-    bookmark() {
-      return {
-        type: 'resource',
-        url: 'gameplan.api.check_bookmark',
-        params: {
-          discussionId: this.postId,
-        },
-        auto: true,
-        onSuccess(data) {
-          this.bookmarkStatus = data
-        },
-      }
-    },
   },
   data() {
     return {
-      editingContent: false,
-      editingTitle: false,
+      editingPost: false,
       discussionMoveDialog: {
         show: false,
         project: null,
       },
       showRevisionsDialog: false,
       showNavbar: false,
-      bookmarkStatus: false,
     }
   },
   methods: {
-    bookMarkDiscussion() {
-      let data = {
-        discussion: this.discussion.name,
-        remove_bookmark: this.bookmarkStatus,
-      }
-      call('gameplan.api.bookmark_discussion', { data }).then((res) => {
-        this.$resources.bookmark.submit()
-      })
-    },
     copyLink() {
       let location = window.location
       let url = `${location.origin}${location.pathname}`
@@ -356,17 +318,10 @@ export default {
     actions() {
       return [
         {
-          label: 'Edit Title',
-          icon: 'edit',
-          onClick: () => {
-            this.editingTitle = true
-          },
-        },
-        {
-          label: 'Edit Post',
+          label: 'Edit',
           icon: 'edit',
           onClick: () => {
-            this.editingContent = true
+            this.editingPost = true
           },
         },
         {
@@ -461,9 +416,20 @@ export default {
           },
         },
         {
-          label: `${this.bookmarkStatus ? 'Remove Bookmark' : 'Add Bookmark'}`,
+          label: 'Bookmark',
           icon: 'bookmark',
-          onClick: this.bookMarkDiscussion,
+          onClick: () => {
+            this.$resources.discussion.addBookmark.submit()
+          },
+          condition: () => !this.discussion.is_bookmarked,
+        },
+        {
+          label: 'Remove Bookmark',
+          icon: 'bookmark',
+          onClick: () => {
+            this.$resources.discussion.removeBookmark.submit()
+          },
+          condition: () => this.discussion.is_bookmarked,
         },
         {
           label: 'Move to...',
@@ -472,6 +438,29 @@ export default {
             this.discussionMoveDialog.show = true
           },
         },
+        {
+          label: 'Delete',
+          icon: 'trash',
+          onClick: () => {
+            $dialog({
+              title: 'Delete',
+              message: 'Are you sure you want to delete this post? This is irreversible!',
+              actions: [
+                {
+                  label: 'Delete',
+                  variant: 'solid',
+                  theme: 'red',
+                  onClick: ({ close }) => {
+                    return this.$resources.discussion.delete.submit().then(() => {
+                      this.$router.replace({ name: 'Project' })
+                      close()
+                    })
+                  },
+                },
+              ],
+            })
+          },
+        },
       ]
     },
   },
diff --git a/frontend/src/pages/Discussions.vue b/frontend/src/pages/Discussions.vue
index 05e63861..f7e39be1 100644
--- a/frontend/src/pages/Discussions.vue
+++ b/frontend/src/pages/Discussions.vue
@@ -258,13 +258,7 @@ export default {
   },
   computed: {
     filters() {
-      const filters = {
-        ...(this.feedType && { feed_type: this.feedType }),
-        ...(activeProjects.value.length && {
-          project: activeProjects.value.map((discussion) => Number(discussion.name)),
-        }),
-      }
-      return filters
+      return this.feedType ? { feed_type: this.feedType } : null
     },
     projectOptions() {
       return activeTeams.value.map((team) => ({
diff --git a/frontend/src/pages/PersonProfileBookmarks.vue b/frontend/src/pages/PersonProfileBookmarks.vue
index 29d8513c..61b304a8 100644
--- a/frontend/src/pages/PersonProfileBookmarks.vue
+++ b/frontend/src/pages/PersonProfileBookmarks.vue
@@ -1,12 +1,9 @@
 <template>
   <div class="pb-16">
     <DiscussionList
-      v-if="bookmarks.length"
       ref="discussionList"
       routeName="ProjectDiscussion"
-      :listOptions="{ filters }"
-      :key="JSON.stringify(filters)"
-      @click="handleDiscussionClick"
+      :listOptions="{ filters: { user_bookmarks: true } }"
     />
   </div>
 </template>
@@ -15,30 +12,6 @@ import DiscussionList from '@/components/DiscussionList.vue'
 
 export default {
   name: 'PersonProfileBookmarks',
-  data() {
-    return {
-      bookmarks: [],
-    }
-  },
-  resources: {
-    bookmark() {
-      return {
-        type: 'resource',
-        url: 'gameplan.api.get_bookmarks',
-        auto: true,
-        onSuccess(data) {
-          if (data) {
-            this.bookmarks = data.map((record) => Number(record.discussion))
-          }
-        },
-      }
-    },
-  },
-  computed: {
-    filters() {
-      return this.bookmarks && this.bookmarks.length ? { name: this.bookmarks } : {}
-    },
-  },
   methods: {
     handleDiscussionClick() {
       this.$emit('close-dialog')
diff --git a/gameplan/api.py b/gameplan/api.py
index 5fb29fcc..8b225896 100644
--- a/gameplan/api.py
+++ b/gameplan/api.py
@@ -456,72 +456,3 @@ def search(query, start=0):
         "total": result.total,
         "duration": result.duration,
     }
-
-
-@frappe.whitelist()
-def check_bookmark(discussionId):
-    doc = frappe.db.get_value("GP Bookmark", {"user": frappe.session.user}, "name")
-    if doc:
-        bookmark = frappe.db.exists(
-            {
-                "doctype": "GP Bookmark Child",
-                "parenttype": "GP Bookmark",
-                "parent": doc,
-                "discussion": discussionId,
-            }
-        )
-        return True if bookmark else False
-    return False
-
-
-@frappe.whitelist()
-def bookmark_discussion(data):
-    data = frappe.parse_json(data)
-    doc_name = frappe.db.get_value("GP Bookmark", {"user": frappe.session.user}, "name")
-    if doc_name:
-        doc = frappe.get_doc("GP Bookmark", doc_name)
-        if data.remove_bookmark:
-            frappe.db.delete(
-                "GP Bookmark Child",
-                {
-                    "parenttype": "GP Bookmark",
-                    "parent": doc.name,
-                    "discussion": data.discussion,
-                },
-            )
-            return "Bookmark removed"
-        else:
-            doc.append(
-                "bookmarks",
-                {"discussion": data.discussion, "date_added": frappe.utils.getdate()},
-            )
-            doc.save(ignore_permissions=True)
-            return "Bookmark added"
-    frappe.get_doc(
-        {
-            "doctype": "GP Bookmark",
-            "user": frappe.session.user,
-            "bookmarks": [
-                {"discussion": data.discussion, "date_added": frappe.utils.getdate()}
-            ],
-        }
-    ).insert()
-    return "Bookmark added"
-
-
-@frappe.whitelist()
-def get_bookmarks():
-    bookmark_child = frappe.qb.DocType("GP Bookmark Child")
-    doc_name = frappe.db.get_value("GP Bookmark", {"user": frappe.session.user}, "name")
-
-    if doc_name:
-        bookmarks = (
-            frappe.qb.from_(bookmark_child)
-            .select(bookmark_child.discussion)
-            .where(bookmark_child.parent == doc_name)
-            .where(bookmark_child.parenttype == "GP Bookmark")
-        ).run(as_dict=True)
-
-        return bookmarks
-
-    return []
diff --git a/gameplan/gameplan/doctype/gp_bookmark/gp_bookmark.json b/gameplan/gameplan/doctype/gp_bookmark/gp_bookmark.json
index 6d2efed3..4d157b93 100644
--- a/gameplan/gameplan/doctype/gp_bookmark/gp_bookmark.json
+++ b/gameplan/gameplan/doctype/gp_bookmark/gp_bookmark.json
@@ -6,7 +6,7 @@
  "engine": "InnoDB",
  "field_order": [
   "user",
-  "bookmarks"
+  "discussion"
  ],
  "fields": [
   {
@@ -18,15 +18,15 @@
    "reqd": 1
   },
   {
-   "fieldname": "bookmarks",
-   "fieldtype": "Table",
-   "label": "Bookmarks",
-   "options": "GP Bookmark Child"
+   "fieldname": "discussion",
+   "fieldtype": "Link",
+   "label": "Discussion",
+   "options": "GP Discussion"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-11-03 18:48:04.503102",
+ "modified": "2024-12-03 16:50:02.939711",
  "modified_by": "Administrator",
  "module": "Gameplan",
  "name": "GP Bookmark",
diff --git a/gameplan/gameplan/doctype/gp_bookmark/gp_bookmark.py b/gameplan/gameplan/doctype/gp_bookmark/gp_bookmark.py
index a846e6cd..1e2ec61a 100644
--- a/gameplan/gameplan/doctype/gp_bookmark/gp_bookmark.py
+++ b/gameplan/gameplan/doctype/gp_bookmark/gp_bookmark.py
@@ -3,7 +3,8 @@
 
 # import frappe
 from frappe.model.document import Document
+from frappe.utils import cint
 
 
 class GPBookmark(Document):
-    pass
+	pass
\ No newline at end of file
diff --git a/gameplan/gameplan/doctype/gp_bookmark_child/__init__.py b/gameplan/gameplan/doctype/gp_bookmark_child/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/gameplan/gameplan/doctype/gp_bookmark_child/gp_bookmark_child.json b/gameplan/gameplan/doctype/gp_bookmark_child/gp_bookmark_child.json
deleted file mode 100644
index 266bc16f..00000000
--- a/gameplan/gameplan/doctype/gp_bookmark_child/gp_bookmark_child.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
- "actions": [],
- "allow_rename": 1,
- "creation": "2024-10-22 15:20:26.515065",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "discussion",
-  "date_added"
- ],
- "fields": [
-  {
-   "fieldname": "discussion",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Discussion",
-   "options": "GP Discussion"
-  },
-  {
-   "fieldname": "date_added",
-   "fieldtype": "Date",
-   "in_list_view": 1,
-   "label": "Date Added"
-  }
- ],
- "index_web_pages_for_search": 1,
- "istable": 1,
- "links": [],
- "modified": "2024-11-03 18:58:48.270784",
- "modified_by": "Administrator",
- "module": "Gameplan",
- "name": "GP Bookmark Child",
- "owner": "Administrator",
- "permissions": [],
- "sort_field": "creation",
- "sort_order": "DESC",
- "states": []
-}
\ No newline at end of file
diff --git a/gameplan/gameplan/doctype/gp_bookmark_child/gp_bookmark_child.py b/gameplan/gameplan/doctype/gp_bookmark_child/gp_bookmark_child.py
deleted file mode 100644
index 3ede398c..00000000
--- a/gameplan/gameplan/doctype/gp_bookmark_child/gp_bookmark_child.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2024, Frappe Technologies Pvt Ltd and contributors
-# For license information, please see license.txt
-
-# import frappe
-from frappe.model.document import Document
-
-
-class GPBookmarkChild(Document):
-    pass
diff --git a/gameplan/gameplan/doctype/gp_discussion/api.py b/gameplan/gameplan/doctype/gp_discussion/api.py
index c83e69bb..1ac56827 100644
--- a/gameplan/gameplan/doctype/gp_discussion/api.py
+++ b/gameplan/gameplan/doctype/gp_discussion/api.py
@@ -8,120 +8,115 @@
 
 
 @frappe.whitelist()
-def get_discussions(
-    filters=None, order_by=None, limit_start=None, limit_page_length=None
-):
-    if not frappe.has_permission("GP Discussion", "read"):
-        frappe.throw(
-            "Insufficient Permission for GP Discussion", frappe.PermissionError
-        )
+def get_discussions(filters=None, order_by=None, limit_start=None, limit_page_length=None):
+	if not frappe.has_permission("GP Discussion", "read"):
+		frappe.throw("Insufficient Permission for GP Discussion", frappe.PermissionError)
 
-    filters = frappe.parse_json(filters) if filters else None
-    feed_type = filters.pop("feed_type", None) if filters else None
-    participator = filters.pop("participator", None) if filters else None
-    order_by = order_by or "last_post_at desc"
-    order_field, order_direction = order_by.split(" ", 1)
+	filters = frappe.parse_json(filters) if filters else None
+	feed_type = filters.pop("feed_type", None) if filters else None
+	participator = filters.pop("participator", None) if filters else None
+	user_bookmarks = filters.pop("user_bookmarks", None) if filters else None
+	order_by = order_by or "last_post_at desc"
+	order_field, order_direction = order_by.split(" ", 1)
 
-    Discussion = frappe.qb.DocType("GP Discussion")
-    Visit = frappe.qb.DocType("GP Discussion Visit")
-    Project = frappe.qb.DocType("GP Project")
-    Team = frappe.qb.DocType("GP Team")
-    Member = frappe.qb.DocType("GP Member")
-    member_exists = (
-        frappe.qb.from_(Member)
-        .select(Member.name)
-        .where(Member.parenttype == "GP Team")
-        .where(Member.parent == Project.team)
-        .where(Member.user == frappe.session.user)
-    )
-    query = (
-        frappe.qb.from_(Discussion)
-        .select(
-            Discussion.star,
-            Visit.last_visit,
-            Project.title.as_("project_title"),
-            Team.title.as_("team_title"),
-        )
-        .left_join(Visit)
-        .on((Discussion.name == Visit.discussion) & (Visit.user == frappe.session.user))
-        .left_join(Project)
-        .on(Discussion.project == Project.name)
-        .left_join(Team)
-        .on(Discussion.team == Team.name)
-        .where(
-            (Project.is_private == 0)
-            | ((Project.is_private == 1) & ExistsCriterion(member_exists))
-        )
-        .limit(limit_page_length)
-        .offset(limit_start or 0)
-    )
-    if filters:
-        for key in filters:
-            if isinstance(filters[key], list) and filters[key]:
-                query = query.where(Discussion[key].isin(filters[key]))
-            else:
-                query = query.where(Discussion[key] == filters[key])
+	Discussion = frappe.qb.DocType("GP Discussion")
+	Visit = frappe.qb.DocType("GP Discussion Visit")
+	Project = frappe.qb.DocType("GP Project")
+	Team = frappe.qb.DocType("GP Team")
+	Member = frappe.qb.DocType("GP Member")
+	member_exists = (
+		frappe.qb.from_(Member)
+		.select(Member.name)
+		.where(Member.parenttype == "GP Team")
+		.where(Member.parent == Project.team)
+		.where(Member.user == frappe.session.user)
+	)
+	query = (
+		frappe.qb.from_(Discussion)
+		.select(
+			Discussion.star,
+			Visit.last_visit,
+			Project.title.as_("project_title"),
+			Team.title.as_("team_title"),
+		)
+		.left_join(Visit)
+		.on((Discussion.name == Visit.discussion) & (Visit.user == frappe.session.user))
+		.left_join(Project)
+		.on(Discussion.project == Project.name)
+		.left_join(Team)
+		.on(Discussion.team == Team.name)
+		.where((Project.is_private == 0) | ((Project.is_private == 1) & ExistsCriterion(member_exists)))
+		.limit(limit_page_length)
+		.offset(limit_start or 0)
+	)
+	if filters:
+		for key in filters:
+			if isinstance(filters[key], list) and filters[key]:
+				query = query.where(Discussion[key].isin(filters[key]))
+			else:
+				query = query.where(Discussion[key] == filters[key])
 
-        # order by pinned_at desc if project is selected
-        if filters.get("project"):
-            query = query.orderby(
-                Discussion.pinned_at, order=frappe._dict(value="desc")
-            )
+		# order by pinned_at desc if project is selected
+		if filters.get("project"):
+			query = query.orderby(Discussion.pinned_at, order=frappe._dict(value="desc"))
 
-    if participator:
-        replies = frappe.db.get_all(
-            "GP Comment",
-            fields=["reference_name"],
-            filters={"reference_doctype": "GP Discussion", "owner": participator},
-            pluck="reference_name",
-        )
-        if not replies:
-            return []
-        replies = list(set(replies))
-        query = query.where(Discussion.name.isin(replies))
+	if participator:
+		replies = frappe.db.get_all(
+			"GP Comment",
+			fields=["reference_name"],
+			filters={"reference_doctype": "GP Discussion", "owner": participator},
+			pluck="reference_name",
+		)
+		if not replies:
+			return []
+		replies = list(set(replies))
+		query = query.where(Discussion.name.isin(replies))
 
-    if feed_type == "unread":
-        query = query.where(
-            (Visit.last_visit < Discussion.last_post_at) | (Visit.last_visit.isnull())
-        )
+	if user_bookmarks:
+		Bookmark = frappe.qb.DocType("GP Bookmark")
+		bookmarked_discussions = Bookmark.select(Bookmark.discussion).where(
+			Bookmark.user == frappe.session.user
+		)
+		query = query.where(Discussion.name.isin(bookmarked_discussions))
 
-    if feed_type == "following":
-        FollowedProject = frappe.qb.DocType("GP Followed Project")
-        followed_projects = FollowedProject.select(FollowedProject.project).where(
-            FollowedProject.user == frappe.session.user
-        )
-        query = query.where(Discussion.project.isin(followed_projects))
+	if feed_type == "unread":
+		query = query.where((Visit.last_visit < Discussion.last_post_at) | (Visit.last_visit.isnull()))
 
-    # default order by last_post_at desc
-    query = query.orderby(
-        Discussion[order_field], order=frappe._dict(value=order_direction)
-    )
+	if feed_type == "following":
+		FollowedProject = frappe.qb.DocType("GP Followed Project")
+		followed_projects = FollowedProject.select(FollowedProject.project).where(
+			FollowedProject.user == frappe.session.user
+		)
+		query = query.where(Discussion.project.isin(followed_projects))
 
-    is_guest = gameplan.is_guest()
-    if is_guest:
-        GuestAccess = frappe.qb.DocType("GP Guest Access")
-        project_list = GuestAccess.select(GuestAccess.project).where(
-            GuestAccess.user == frappe.session.user
-        )
-        query = query.where(Discussion.project.isin(project_list))
+	# default order by last_post_at desc
+	query = query.orderby(Discussion[order_field], order=frappe._dict(value=order_direction))
 
-    discussions = query.run(as_dict=1)
-    Poll = frappe.qb.DocType("GP Poll")
-    discussion_names = [d.name for d in discussions]
-    ongoing_polls = (
-        (
-            frappe.qb.from_(Poll)
-            .select(Poll.name, Poll.owner, Poll.discussion)
-            .where(Poll.stopped_at.isnull() | (Poll.stopped_at > frappe.utils.now()))
-            .where(Poll.discussion.isin(discussion_names))
-            .orderby(Poll.creation, order=frappe._dict(value="asc"))
-            .run(as_dict=1)
-        )
-        if discussion_names
-        else []
-    )
-    for discussion in discussions:
-        discussion["ongoing_polls"] = [
-            p for p in ongoing_polls if str(p.discussion) == str(discussion.name)
-        ]
-    return discussions
+	is_guest = gameplan.is_guest()
+	if is_guest:
+		GuestAccess = frappe.qb.DocType("GP Guest Access")
+		project_list = GuestAccess.select(GuestAccess.project).where(
+			GuestAccess.user == frappe.session.user
+		)
+		query = query.where(Discussion.project.isin(project_list))
+
+	discussions = query.run(as_dict=1)
+	Poll = frappe.qb.DocType("GP Poll")
+	discussion_names = [d.name for d in discussions]
+	ongoing_polls = (
+		(
+			frappe.qb.from_(Poll)
+			.select(Poll.name, Poll.owner, Poll.discussion)
+			.where(Poll.stopped_at.isnull() | (Poll.stopped_at > frappe.utils.now()))
+			.where(Poll.discussion.isin(discussion_names))
+			.orderby(Poll.creation, order=frappe._dict(value="asc"))
+			.run(as_dict=1)
+		)
+		if discussion_names
+		else []
+	)
+	for discussion in discussions:
+		discussion["ongoing_polls"] = [
+			p for p in ongoing_polls if str(p.discussion) == str(discussion.name)
+		]
+	return discussions
diff --git a/gameplan/gameplan/doctype/gp_discussion/gp_discussion.py b/gameplan/gameplan/doctype/gp_discussion/gp_discussion.py
index 89f2c04a..6c83bb4b 100644
--- a/gameplan/gameplan/doctype/gp_discussion/gp_discussion.py
+++ b/gameplan/gameplan/doctype/gp_discussion/gp_discussion.py
@@ -11,7 +11,7 @@
 from gameplan.utils import remove_empty_trailing_paragraphs, url_safe_slug
 
 class GPDiscussion(HasActivity, HasMentions, HasReactions, Document):
-	on_delete_cascade = ['GP Comment', 'GP Discussion Visit', 'GP Activity']
+	on_delete_cascade = ['GP Comment', 'GP Discussion Visit', 'GP Activity', 'GP Poll']
 	on_delete_set_null = ['GP Notification']
 	activities = ['Discussion Closed', 'Discussion Reopened', 'Discussion Title Changed', 'Discussion Pinned', 'Discussion Unpinned']
 	mentions_field = 'content'
@@ -35,6 +35,7 @@ def as_dict(self, *args, **kwargs):
 			pluck='name'
 		)
 		d.last_unread_poll = polls[0] if polls else None
+		d.is_bookmarked = self.is_bookmarked()
 		return d
 
 	def before_insert(self):
@@ -45,6 +46,7 @@ def after_insert(self):
 		self.update_discussions_count(1)
 
 	def on_trash(self):
+		self.remove_bookmark()
 		self.update_discussions_count(-1)
 
 	def validate(self):
@@ -158,6 +160,26 @@ def unpin_discussion(self):
 		self.log_activity('Discussion Unpinned')
 		self.save()
 
+	@frappe.whitelist()
+	def add_bookmark(self):
+		if self.is_bookmarked():
+			return
+		frappe.new_doc("GP Bookmark", discussion=self.name, user=frappe.session.user).insert()
+
+	@frappe.whitelist()
+	def remove_bookmark(self):
+		bookmark = frappe.db.get_value(
+			"GP Bookmark", {"discussion": self.name, "user": frappe.session.user}, "name"
+		)
+		if not bookmark:
+			return
+		frappe.get_doc("GP Bookmark", bookmark).delete()
+
+	def is_bookmarked(self):
+		return bool(
+			frappe.db.exists("GP Bookmark", {"discussion": self.name, "user": frappe.session.user})
+		)
+
 	def update_discussions_count(self, delta=1):
 		project = frappe.get_doc("GP Project", self.project)
 		project.discussions_count = project.discussions_count + delta
diff --git a/gameplan/gameplan/doctype/gp_discussion/patches/migrate_gp_bookmark_child.py b/gameplan/gameplan/doctype/gp_discussion/patches/migrate_gp_bookmark_child.py
new file mode 100644
index 00000000..135cffe5
--- /dev/null
+++ b/gameplan/gameplan/doctype/gp_discussion/patches/migrate_gp_bookmark_child.py
@@ -0,0 +1,18 @@
+# Copyright (c) 2024, Frappe Technologies Pvt. Ltd. and Contributors
+
+from __future__ import unicode_literals
+import frappe
+
+
+def execute():
+	frappe.reload_doctype("GP Bookmark")
+	for d in frappe.db.get_all("GP Bookmark"):
+		try:
+			doc = frappe.get_doc("GP Bookmark", d.name)
+			for row in doc.bookmarks:
+				bdoc = frappe.new_doc("GP Bookmark", discussion=row.discussion, user=doc.user).insert()
+				bdoc.db_set("creation", row.date_added)
+			doc.delete()
+		except Exception as e:
+			print(f"Could not migrate bookmark {d.name}: {e}")
+			frappe.db.rollback()
diff --git a/gameplan/patches.txt b/gameplan/patches.txt
index cd0b5196..5fc60de1 100644
--- a/gameplan/patches.txt
+++ b/gameplan/patches.txt
@@ -1,5 +1,6 @@
 [pre_model_sync]
 gameplan.patches.rename_doctypes_with_gp_prefix
+gameplan.gameplan.doctype.gp_discussion.patches.migrate_gp_bookmark_child
 
 [post_model_sync]
 gameplan.gameplan.doctype.team_user_profile.patches.create_user_profile