diff --git a/CHANGELOG.md b/CHANGELOG.md
index e98198b7e..e31d1e0a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,7 +56,9 @@
 * nostr: require `fmt::Debug`, `Send` and `Sync` for `NostrSigner` ([Yuki Kishimoto])
 * nostr: enable support for `Tags::indexes` in `no_std` ([Yuki Kishimoto])
 * nostr: improve `RelayMessage` docs ([Yuki Kishimoto])
+* nostr: include public key of root and parent author in `EventBuilder::comment` ([Yuki Kishimoto])
 * nostr: dedup tags in `EventBuilder::text_note_reply` and `EventBuilder::comment` ([Yuki Kishimoto])
+* nostr: don't use reply event as root `e` tag i no root is set in `EventBuilder::text_note_reply` ([Yuki Kishimoto])
 * database: add manual trait implementations for `BTreeCappedSet` ([Yuki Kishimoto]) 
 * database: replace LRU with custom memory cache for IDs tracking ([Yuki Kishimoto])
 * lmdb: use `async-utility` to spawn blocking tasks ([Yuki Kishimoto])
diff --git a/bindings/nostr-sdk-ffi/src/protocol/event/builder.rs b/bindings/nostr-sdk-ffi/src/protocol/event/builder.rs
index e56b8fc9c..e6f5d5348 100644
--- a/bindings/nostr-sdk-ffi/src/protocol/event/builder.rs
+++ b/bindings/nostr-sdk-ffi/src/protocol/event/builder.rs
@@ -141,8 +141,6 @@ impl EventBuilder {
 
     /// Text note reply
     ///
-    /// If no `root` is passed, the `reply_to` will be used for root `e` tag.
-    ///
     /// <https://github.com/nostr-protocol/nips/blob/master/10.md>
     #[uniffi::constructor(default(root = None, relay_url = None))]
     pub fn text_note_reply(
diff --git a/bindings/nostr-sdk-js/src/protocol/event/builder.rs b/bindings/nostr-sdk-js/src/protocol/event/builder.rs
index ca2d2a4f8..b2c79a359 100644
--- a/bindings/nostr-sdk-js/src/protocol/event/builder.rs
+++ b/bindings/nostr-sdk-js/src/protocol/event/builder.rs
@@ -140,8 +140,6 @@ impl JsEventBuilder {
 
     /// Text note reply
     ///
-    /// If no `root` is passed, the `reply_to` will be used for root `e` tag.
-    ///
     /// <https://github.com/nostr-protocol/nips/blob/master/10.md>
     #[wasm_bindgen(js_name = textNoteReply)]
     pub fn text_note_reply(
diff --git a/crates/nostr/src/event/builder.rs b/crates/nostr/src/event/builder.rs
index bf0436839..7978a6267 100644
--- a/crates/nostr/src/event/builder.rs
+++ b/crates/nostr/src/event/builder.rs
@@ -389,8 +389,6 @@ impl EventBuilder {
 
     /// Text note reply
     ///
-    /// If no `root` is passed, the `reply_to` will be used for root `e` tag.
-    ///
     /// <https://github.com/nostr-protocol/nips/blob/master/10.md>
     pub fn text_note_reply<S>(
         content: S,
@@ -443,11 +441,10 @@ impl EventBuilder {
                 );
             }
             None => {
-                // No root event is passed, use `reply_to` event ID for `root` marker
                 tags.push(Tag::from_standardized_without_cell(TagStandard::Event {
                     event_id: reply_to.id,
                     relay_url,
-                    marker: Some(Marker::Root),
+                    marker: Some(Marker::Reply),
                     public_key: Some(reply_to.pubkey),
                     uppercase: false,
                 }));