diff --git a/src/lib/components/events/content/IssuePreview.svelte b/src/lib/components/events/content/IssuePreview.svelte
index 11b9a42..57cbe7b 100644
--- a/src/lib/components/events/content/IssuePreview.svelte
+++ b/src/lib/components/events/content/IssuePreview.svelte
@@ -3,6 +3,7 @@
   import { extractRepoAFromProposalEvent } from '$lib/stores/Proposals'
   import type { NDKEvent } from '@nostr-dev-kit/ndk'
   import { nip19 } from 'nostr-tools'
+  import { extractIssueTitle } from './utils'
 
   export let event: NDKEvent
   let nevent = nip19.neventEncode({
@@ -17,5 +18,5 @@
 <span>
   Git Issue for <a class="opacity-50" href={`/e/${naddr}`}
     >{pointer?.identifier}</a
-  >: <a href={`/e/${nevent}`}>{event.content?.split('\n')[0]}</a> by
+  >: <a href={`/e/${nevent}`}>{extractIssueTitle(event)}</a> by
 </span>
diff --git a/src/lib/components/events/content/utils.ts b/src/lib/components/events/content/utils.ts
index 9fd667f..94a0632 100644
--- a/src/lib/components/events/content/utils.ts
+++ b/src/lib/components/events/content/utils.ts
@@ -1,4 +1,4 @@
-import type { NDKTag } from '@nostr-dev-kit/ndk'
+import type { NDKEvent, NDKTag } from '@nostr-dev-kit/ndk'
 import { nip19 } from 'nostr-tools'
 import type { AddressPointer, EventPointer } from 'nostr-tools/nip19'
 import last from 'ramda/src/last'
@@ -307,8 +307,8 @@ export const extractPatchDescription = (s: string): string | undefined => {
   return msg.substring(i).trim()
 }
 
-export const extractIssueTitle = (s: string): string => {
-  return s.split('\n')[0] || ''
+export const extractIssueTitle = (event: NDKEvent): string => {
+  return event.tagValue('subject') || event.content.split('\n')[0] || ''
 }
 
 export const extractIssueDescription = (s: string): string => {
diff --git a/src/lib/stores/Issue.ts b/src/lib/stores/Issue.ts
index 9f23e3c..eb83684 100644
--- a/src/lib/stores/Issue.ts
+++ b/src/lib/stores/Issue.ts
@@ -80,7 +80,7 @@ export const ensureIssueFull = (
             issue_event: event,
             summary: {
               ...full.summary,
-              title: extractIssueTitle(event.content),
+              title: extractIssueTitle(event),
               descritpion: extractIssueDescription(event.content),
               created_at: event.created_at,
               comments: 0,
diff --git a/src/lib/stores/Issues.ts b/src/lib/stores/Issues.ts
index 0060028..8f47704 100644
--- a/src/lib/stores/Issues.ts
+++ b/src/lib/stores/Issues.ts
@@ -107,7 +107,7 @@ export const ensureIssueSummaries = async (repo_a: string | undefined) => {
                 id: event.id,
                 repo_a:
                   extractRepoIdentiferFromIssueEvent(event) || repo_a || '',
-                title: extractIssueTitle(event.content),
+                title: extractIssueTitle(event),
                 descritpion: extractIssueDescription(event.content),
                 created_at: event.created_at,
                 comments: 0,
diff --git a/src/lib/wrappers/ComposeIssue.svelte b/src/lib/wrappers/ComposeIssue.svelte
index 1a45a16..8440b27 100644
--- a/src/lib/wrappers/ComposeIssue.svelte
+++ b/src/lib/wrappers/ComposeIssue.svelte
@@ -26,7 +26,7 @@
     if (!$logged_in_user) return
     let event = new NDKEvent(ndk)
     event.kind = issue_kind
-
+    event.tags.push(['subject', title])
     event.tags.push(['alt', `git repository issue: ${title}`])
 
     if (repo_event.unique_commit) {
@@ -39,7 +39,7 @@
       'root',
     ])
     repo_event.maintainers.forEach((m) => event.tags.push(['p', m]))
-    event.content = `${title}\n\n${content}`
+    event.content = `${content}`
     submitting = true
     let relays = [
       ...(repo_event.relays.length > 3