diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index 6b9cc4c1adc..454ff279324 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -22,7 +22,7 @@ so I'm going to stop rendering it until we figure out what's up
           {{plugin-outlet "composer-open"}}
 
           <div class='reply-to'>
-            {{{model.actionTitle}}} 
+            {{{model.actionTitle}}}
             {{#if canEdit}}
               {{#if showEditReason}}
                 <div class="edit-reason-input">
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index ad92521f6c9..e2e30d5888d 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1133,10 +1133,10 @@ en:
           other: "You have selected <b>{{count}}</b> posts."
 
     post:
-      reply: "Replying to {{link}} by {{replyAvatar}} {{username}}"
+      reply: "Replying to {{link}} {{replyAvatar}} {{username}}"
       reply_topic: "Reply to {{link}}"
       quote_reply: "quote reply"
-      edit: "Editing {{link}} by {{replyAvatar}} {{username}}"
+      edit: "Editing {{link}} {{replyAvatar}} {{username}}"
       edit_reason: "Reason: "
       post_number: "post {{number}}"
       in_reply_to: "reply to"