diff --git a/src/controller/buffers/blueski/base.py b/src/controller/buffers/blueski/base.py
index 48c0ae26..4654d6e8 100644
--- a/src/controller/buffers/blueski/base.py
+++ b/src/controller/buffers/blueski/base.py
@@ -224,19 +224,8 @@ class BaseBuffer(base.Buffer):
         reply_cid = self.get_selected_item_cid()
         # Attempt to get CID if present for consistency, though send_message handles it
 
-        def g(obj, key, default=None):
-            if isinstance(obj, dict):
-                return obj.get(key, default)
-            return getattr(obj, key, default)
-
-        author = g(item, "author")
-        if not author:
-            post = g(item, "post") or g(item, "record")
-            author = g(post, "author") if post else None
-        handle = g(author, "handle", "")
-        initial_text = f"@{handle} " if handle and not handle.startswith("@") else (f"{handle} " if handle else "")
-
-        dlg = blueski_messages.post(session=self.session, title=_("Reply"), caption=_("Reply"), text=initial_text)
+        # No "@handle" prefill: the reply reference (parent/root) already notifies the author.
+        dlg = blueski_messages.post(session=self.session, title=_("Reply"), caption=_("Reply"))
         if dlg.message.ShowModal() == wx.ID_OK:
              text, files, cw, langs = dlg.get_data()
              refresh_args = (True, False) if getattr(self, "type", "") == "conversation" else None
@@ -495,9 +484,8 @@ class BaseBuffer(base.Buffer):
          # Use full post dialog like Mastodon
          title = _("Conversation with {0}").format(handle)
          caption = _("Write your message here")
-         initial_text = "@{} ".format(handle)
 
-         post = blueski_messages.post(session=self.session, title=title, caption=caption, text=initial_text)
+         post = blueski_messages.post(session=self.session, title=title, caption=caption)
          if post.message.ShowModal() == wx.ID_OK:
              text, files, cw_text, langs = post.get_data()
              if text:
diff --git a/src/controller/buffers/blueski/chat.py b/src/controller/buffers/blueski/chat.py
index 53280317..e31a3056 100644
--- a/src/controller/buffers/blueski/chat.py
+++ b/src/controller/buffers/blueski/chat.py
@@ -331,9 +331,8 @@ class ConversationListBuffer(BaseBuffer):
 
         title = _("Conversation with {0}").format(username)
         caption = _("Write your message here")
-        initial_text = "@{} ".format(username)
 
-        post = blueski_messages.post(session=self.session, title=title, caption=caption, text=initial_text)
+        post = blueski_messages.post(session=self.session, title=title, caption=caption)
         if post.message.ShowModal() == wx.ID_OK:
             text, files, cw_text, langs = post.get_data()
             if text:
diff --git a/src/controller/buffers/mastodon/base.py b/src/controller/buffers/mastodon/base.py
index 63b24247..64079488 100644
--- a/src/controller/buffers/mastodon/base.py
+++ b/src/controller/buffers/mastodon/base.py
@@ -449,7 +449,7 @@ class BaseBuffer(base.Buffer):
                 users.append("@{} ".format(item.reblog.account.acct))
         else:
             users = ["@{} ".format(user.acct) for user in item.mentions if user.id != self.session.db["user_id"]]
-        if item.account.acct not in users and item.account.id != self.session.db["user_id"]:
+        if "@{} ".format(item.account.acct) not in users and item.account.id != self.session.db["user_id"]:
             users.insert(0, "@{} ".format(item.account.acct))
         users_str = "".join(users)
         post = messages.post(session=self.session, title=title, caption=caption, text=users_str)