diff --git a/app/mailers/notifier.rb b/app/mailers/notifier.rb
index b83c3f70096e43f8bfb4ce43e557f8d9ef9bdc8e..b50155c4f756f72356e04f021c223cd4899ecfa2 100644
--- a/app/mailers/notifier.rb
+++ b/app/mailers/notifier.rb
@@ -1,6 +1,6 @@
 class Notifier < ActionMailer::Base
   
-  default :from => "no-reply@joindiaspora.com"
+  default :from => APP_CONFIG[:smtp_sender_address]
   
   ATTACHMENT = File.read("#{Rails.root}/public/images/diaspora_white_on_grey.png")
 
diff --git a/config/app_config.yml.example b/config/app_config.yml.example
index 9e3f0d2983c3336140aa4ed4ebcd40d8fe40b0af..5d2617fd6b55653e0e620aa9166dc0563f52fe06 100644
--- a/config/app_config.yml.example
+++ b/config/app_config.yml.example
@@ -54,7 +54,7 @@ default:
   smtp_domain: 'example.com'
 
   # Sender address in diaspora's outgoing mail.
-  smtp_sender_address: 'no-reply@example.com'
+  smtp_sender_address: 'no-reply@joindiaspora.com'
 
   # Authentication required to send mail. Use one of 'one','plain',
   # 'login' or 'cram-md5'. Use 'none' if server do not support