diff --git a/plugins/messages/app/mailers/messages_mailer.rb b/plugins/messages/app/mailers/messages_mailer.rb
index 5a73a600..f3003686 100644
--- a/plugins/messages/app/mailers/messages_mailer.rb
+++ b/plugins/messages/app/mailers/messages_mailer.rb
@@ -6,6 +6,7 @@ class MessagesMailer < Mailer
 
     mail subject: "[#{FoodsoftConfig[:name]}] " + message.subject,
          to: recipient.email,
-         from: "#{show_user(message.sender)} <#{message.sender.email}>"
+         from: "#{show_user(message.sender)} via Foodsoft <#{FoodsoftConfig[:email_sender]}>",
+         reply_to: "#{show_user(message.sender)} <#{message.sender.email}>"
   end
 end