diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
index 884e0d240..abeb3ae09 100644
--- a/app/mailers/application_mailer.rb
+++ b/app/mailers/application_mailer.rb
@@ -1,5 +1,5 @@
 class ApplicationMailer < ActionMailer::Base
-  default from: "Fizzy <support@37signals.com>"
+  default from: "Fizzy <support@fizzy.do>"
 
   layout "mailer"
   append_view_path Rails.root.join("app/views/mailers")
diff --git a/lib/web_push/notification.rb b/lib/web_push/notification.rb
index 891f53799..d2865ff46 100644
--- a/lib/web_push/notification.rb
+++ b/lib/web_push/notification.rb
@@ -15,7 +15,7 @@ class WebPush::Notification
 
   private
     def vapid_identification
-      { subject: "mailto:support@37signals.com" }.merge \
+      { subject: "mailto:support@fizzy.do" }.merge \
         Rails.configuration.x.vapid.symbolize_keys
     end