diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
new file mode 100644
index 0000000000000000000000000000000000000000..e5ed1ffd07db2727fa45d8f1ab268fd5410c4608
--- /dev/null
+++ b/app/mailers/application_mailer.rb
@@ -0,0 +1,3 @@
+class ApplicationMailer < ActionMailer::Base
+  default from: "\"#{AppConfig.settings.pod_name}\" <#{AppConfig.mail.sender_address}>"
+end
diff --git a/app/mailers/diaspora_devise_mailer.rb b/app/mailers/diaspora_devise_mailer.rb
index 9a18ffb38c39dfcf14e5226945c1e2268e14055f..069b488b5d52a2d9f801692f5acdf899ec1055e2 100644
--- a/app/mailers/diaspora_devise_mailer.rb
+++ b/app/mailers/diaspora_devise_mailer.rb
@@ -1,5 +1,5 @@
 class DiasporaDeviseMailer < Devise::Mailer
-  default :from => AppConfig.mail.sender_address
+  default from: "\"#{AppConfig.settings.pod_name}\" <#{AppConfig.mail.sender_address}>"
 
   def self.mailer_name
     "devise/mailer"
diff --git a/app/mailers/export_mailer.rb b/app/mailers/export_mailer.rb
index a0bc8b5e591cf9a610ccea8b5265840d627097b7..5139be7349df56feb940cdc4d873b8dbed02d512 100644
--- a/app/mailers/export_mailer.rb
+++ b/app/mailers/export_mailer.rb
@@ -1,6 +1,4 @@
-class ExportMailer < ActionMailer::Base
-  default from: AppConfig.mail.sender_address
-
+class ExportMailer < ApplicationMailer
   def export_complete_for(user)
     @user = user
 
diff --git a/app/mailers/maintenance.rb b/app/mailers/maintenance.rb
index 6b0f2e07b07c8188f59604b93a63dcf389135581..185b4f949d4bcdba170da22e892ca56811f05bc2 100644
--- a/app/mailers/maintenance.rb
+++ b/app/mailers/maintenance.rb
@@ -1,6 +1,4 @@
-class Maintenance < ActionMailer::Base
-  default :from => AppConfig.mail.sender_address
-
+class Maintenance < ApplicationMailer
   def account_removal_warning(user)
     @user = user
     @login_url  = new_user_session_url
diff --git a/app/mailers/notifier.rb b/app/mailers/notifier.rb
index d58a58761ce31d4b9193e103be382ecf59254b55..187c7b0ed89e0c7450e8c58e767b465f99432f23 100644
--- a/app/mailers/notifier.rb
+++ b/app/mailers/notifier.rb
@@ -1,4 +1,4 @@
-class Notifier < ActionMailer::Base
+class Notifier < ApplicationMailer
   helper :application
   helper :notifier
   helper :people
diff --git a/app/mailers/report_mailer.rb b/app/mailers/report_mailer.rb
index 498413367aa4ca4b74071027cd2a11edcf8367ff..0ac76892fa26db37a9bc55ef1a68801a1c63b958 100644
--- a/app/mailers/report_mailer.rb
+++ b/app/mailers/report_mailer.rb
@@ -1,6 +1,4 @@
-class ReportMailer < ActionMailer::Base
-  default from: "\"#{AppConfig.settings.pod_name}\" <#{AppConfig.mail.sender_address}>"
-
+class ReportMailer < ApplicationMailer
   def self.new_report(report_id)
     report = Report.find_by_id(report_id)
     Role.moderators.map {|role| super(report.item_type, report.item_id, report.text, role) }