diff --git a/app/mailers/volunteer_mailer.rb b/app/mailers/volunteer_mailer.rb
index d96b7a1..fa99ed1 100644
--- a/app/mailers/volunteer_mailer.rb
+++ b/app/mailers/volunteer_mailer.rb
@@ -13,7 +13,7 @@ class VolunteerMailer < ActionMailer::Base
     I18n.locale = @volunteer.language
     mail(to: @volunteer.email,
          reply_to: @volunteer.conference.email,
-         from: "cfp@openfest.org",
+         from: "OpenFest <cfp@openfest.org>",
          subject: I18n.t("volunteer_mailer.success_notification.subject",
            conference_name: @volunteer.conference.title))
   end
@@ -23,7 +23,7 @@ class VolunteerMailer < ActionMailer::Base
     I18n.locale = @volunteer.language
     mail(to: @volunteer.email,
          reply_to: @volunteer.conference.email,
-         from: "cfp@openfest.org",
+         from: "OpenFest <cfp@openfest.org>",
          subject: I18n.t("volunteer_mailer.email_confirmation.subject",
                          conference_name: @volunteer.conference.title))
   end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 0efb41f..6af3a47 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -87,7 +87,7 @@ Rails.application.configure do
   # config.action_mailer.raise_delivery_errors = false
 
   config.action_mailer.delivery_method = :smtp
-  config.action_mailer.default_options = {from: "cfp@openfest.org"}
+  config.action_mailer.default_options = {from: "OpenFest <cfp@openfest.org>"}
   config.action_mailer.default_url_options = {host: "cfp.openfest.org"}
   config.action_mailer.smtp_settings = {
     address: "mail.openfest.org"
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index cdcfe1c..63475af 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -12,7 +12,7 @@ Devise.setup do |config|
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class
   # with default "from" parameter.
-  config.mailer_sender = "cfp@openfest.org"
+  config.mailer_sender = "OpenFest <cfp@openfest.org>"
 
   # Configure the class responsible to send e-mails.
   # config.mailer = 'Devise::Mailer'