diff --git a/app/assets/javascripts/discourse/components/bbcode.js b/app/assets/javascripts/discourse/components/bbcode.js
index 4dbc9506d5a..50cd2fdbd65 100644
--- a/app/assets/javascripts/discourse/components/bbcode.js
+++ b/app/assets/javascripts/discourse/components/bbcode.js
@@ -254,7 +254,7 @@ Discourse.BBCode = {
 
       // Arguments for formatting
       args = {
-        username: username,
+        username: I18n.t('user.said',{username: username}),
         params: params,
         quote: content,
         avatarImg: opts.lookupAvatar ? opts.lookupAvatar(username) : void 0
diff --git a/app/assets/javascripts/discourse/templates/quote.js.shbrs b/app/assets/javascripts/discourse/templates/quote.js.shbrs
index 3310f820c29..e313f1e83d8 100644
--- a/app/assets/javascripts/discourse/templates/quote.js.shbrs
+++ b/app/assets/javascripts/discourse/templates/quote.js.shbrs
@@ -3,7 +3,6 @@
     <div class='quote-controls'></div>
   {{{avatarImg}}}
   {{username}}
-  said:
   </div>
   <blockquote>{{{quote}}}</blockquote>
 </aside>
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 8ad56b92b1e..1a019c2d858 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -168,6 +168,7 @@ en:
       "13": "Inbox"
 
     user:
+      said: "{{username}} said:"
       profile: Profile
       mute: Mute
       edit: Edit Preferences
diff --git a/lib/assets/quote_email.js.shbrs b/lib/assets/quote_email.js.shbrs
index fc3eb126384..61cda029685 100644
--- a/lib/assets/quote_email.js.shbrs
+++ b/lib/assets/quote_email.js.shbrs
@@ -1,6 +1,6 @@
 <table cellspacing="0" cellpadding="0" style="border: 1px solid #eee; -webkit-border-radius: 10px;">
   <tr>
-    <th style="text-align:left; background-color: #eee; padding: 5px">{{{avatarImg}}} {{username}} said:</th>
+    <th style="text-align:left; background-color: #eee; padding: 5px">{{{avatarImg}}} {{username}}</th>
   </tr>
   <tr>
     <td style="padding: 10px; background-color: #f9f9f9">{{{quote}}}</td>