diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb
index 7b2b14aeb31..22b63aaede3 100644
--- a/app/mailers/user_notifications.rb
+++ b/app/mailers/user_notifications.rb
@@ -27,7 +27,8 @@ class UserNotifications < ActionMailer::Base
                 url: post.url,
                 subject_prefix: post.post_number != 1 ? "re: " : "",
                 topic_title: post.topic.title,
-                from: post.user.name,
+                private_message_from: post.user.name,
+                from: "#{I18n.t(:via, username: post.user.name, site_name: SiteSetting.title)} <#{SiteSetting.notification_email}>",
                 add_unsubscribe_link: true
   end
 
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 9ec175f254f..5f0f5dbc34d 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -708,7 +708,7 @@ en:
     private_message:
       subject_template: "[%{site_name}] %{subject_prefix}%{topic_title}"
       text_body_template: |
-        %{from} just sent you a private message
+        %{private_message_from} just sent you a private message
 
         ---
         %{message}