diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94db60342..fbbad8716 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -104,6 +104,8 @@
 - Updated DiscoverController, fix trending api. ([2ab2c9a](https://github.com/pixelfed/pixelfed/commit/2ab2c9a))
 - Updated Dark Mode layout. ([d6f8170](https://github.com/pixelfed/pixelfed/commit/d6f8170))
 - Updated federation config, make sharedInbox enabled by default. ([6e3522c0](https://github.com/pixelfed/pixelfed/commit/6e3522c0))
+- Updated PostComponent, change timestamp format. ([e51665f6](https://github.com/pixelfed/pixelfed/commit/e51665f6))
+- Updated PostComponent, use proper username context for reply mentions. Fixes ([#2421](https://github.com/pixelfed/pixelfed/issues/2421)). ([dac06088](https://github.com/pixelfed/pixelfed/commit/dac06088))
 
 ## [v0.10.9 (2020-04-17)](https://github.com/pixelfed/pixelfed/compare/v0.10.8...v0.10.9)
 ### Added
diff --git a/public/js/status.js b/public/js/status.js
index 253944a1d..7448fe911 100644
Binary files a/public/js/status.js and b/public/js/status.js differ
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index edd596883..4f20ddd23 100644
Binary files a/public/mix-manifest.json and b/public/mix-manifest.json differ
diff --git a/resources/assets/js/components/PostComponent.vue b/resources/assets/js/components/PostComponent.vue
index 5ca341865..e12d0b563 100644
--- a/resources/assets/js/components/PostComponent.vue
+++ b/resources/assets/js/components/PostComponent.vue
@@ -245,7 +245,7 @@
                   </span>
                 </div>
                 <div class="timestamp pt-2 d-flex align-items-bottom justify-content-between">
-                  <a v-bind:href="statusUrl" class="small text-muted">
+                  <a v-bind:href="statusUrl" class="small text-muted" :title="status.created_at">
                     {{timestampFormat()}}
                   </a>
                   <span class="small text-muted text-capitalize cursor-pointer" v-on:click="visibilityModal">{{status.visibility}}</span>
@@ -831,7 +831,7 @@ export default {
 
       timestampFormat() {
           let ts = new Date(this.status.created_at);
-          return ts.toDateString() + ' ' + ts.toLocaleTimeString();
+          return ts.toDateString();
       },
 
       fetchData() {
@@ -1149,8 +1149,10 @@ export default {
           this.replyToIndex = index;
           this.replyingToId = e.id;
           this.reply_to_profile_id = e.account.id;
+          let username = e.account.local ? '@' + e.account.username + ' '
+            : '@' + e.account.acct + ' ';
           if(prependUsername == true) {
-            this.replyText = '@' + e.account.username + ' ';
+            this.replyText = username;
           }
           $('textarea[name="comment"]').focus();
       },