diff --git a/damus/Views/PostView.swift b/damus/Views/PostView.swift
index ea4385b9..b78af40f 100644
--- a/damus/Views/PostView.swift
+++ b/damus/Views/PostView.swift
@@ -883,6 +883,8 @@ func build_post(state: DamusState, post: NSAttributedString, action: PostAction,
     case .quoting(let ev):
         content.append("\n\nnostr:" + bech32_note_id(ev.id))
 
+        tags.append(["q", ev.id.hex()]);
+
         if let quoted_ev = state.events.lookup(ev.id) {
             tags.append(["p", quoted_ev.pubkey.hex()])
         }
diff --git a/damusTests/PostViewTests.swift b/damusTests/PostViewTests.swift
index 0cb68c00..7b8ddc2b 100644
--- a/damusTests/PostViewTests.swift
+++ b/damusTests/PostViewTests.swift
@@ -170,6 +170,12 @@ final class PostViewTests: XCTestCase {
         
         nonAlphaNumerics.forEach { testAddingStringAfterLink(str: $0)}
     }
+
+    func testQuoteRepost() {
+        let post = build_post(state: test_damus_state, post: .init(), action: .quoting(test_note), uploadedMedias: [], pubkeys: [])
+
+        XCTAssertEqual(post.tags, [["q", test_note.id.hex()]])
+    }
 }
 
 func checkMentionLinkEditorHandling(