diff --git a/Changelog.md b/Changelog.md
index 7fa834a47..71632d929 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -31,6 +31,7 @@
 * Add help section about keyboard shortcuts [#5100](https://github.com/diaspora/diaspora/pull/5100)
 * Automatically add poll answers as needed [#5109](https://github.com/diaspora/diaspora/pull/5109)
 * Add Terms of Service as an option for podmins, includes base template [#5104](https://github.com/diaspora/diaspora/pull/5104)
+* Add rake task to send a mail to all users [#5111](https://github.com/diaspora/diaspora/pull/5111)
 
 # 0.4.0.1
 
diff --git a/app/mailers/notifier.rb b/app/mailers/notifier.rb
index 5abce9ee0..00dd5e109 100644
--- a/app/mailers/notifier.rb
+++ b/app/mailers/notifier.rb
@@ -3,16 +3,16 @@ class Notifier < ActionMailer::Base
   helper :notifier
   helper :people
 
-  def self.admin(string, recipients, opts = {})
+  def self.admin(string, recipients, opts = {}, subject=nil)
     mails = []
     recipients.each do |rec|
-      mail = single_admin(string, rec, opts.dup)
+      mail = single_admin(string, rec, opts.dup, subject)
       mails << mail
     end
     mails
   end
 
-  def single_admin(string, recipient, opts={})
+  def single_admin(string, recipient, opts={}, subject=nil)
     @receiver = recipient
     @string = string.html_safe
 
@@ -22,13 +22,15 @@ class Notifier < ActionMailer::Base
       }
     end
 
+    unless subject
+      subject = I18n.t('notifier.single_admin.subject')
+    end
+
     default_opts = {:to => @receiver.email,
          :from => AppConfig.mail.sender_address,
-         :subject => I18n.t('notifier.single_admin.subject'),  :host => AppConfig.pod_uri.host}
+         :subject => subject, :host => AppConfig.pod_uri.host}
     default_opts.merge!(opts)
 
-
-
     mail(default_opts) do |format|
       format.text
       format.html
diff --git a/lib/tasks/podmin.rake b/lib/tasks/podmin.rake
new file mode 100644
index 000000000..dc5289cbd
--- /dev/null
+++ b/lib/tasks/podmin.rake
@@ -0,0 +1,32 @@
+namespace :podmin do
+  
+  desc "Send an email to users as admin"
+  task :admin_mail, [:users_def, :msg_path, :subject] => :environment do |t, args|
+    if args[:users_def] == 'all'
+      # to all except deleted and deactivated, of course
+      users = User.where("locked_at is null and username is not null")
+    elsif args[:users_def] == 'active_yearly'
+      users = User.yearly_actives
+    elsif args[:users_def] == 'active_monthly'
+      users = User.monthly_actives
+    elsif args[:users_def] == 'active_halfyear'
+      users = User.halfyear_actives
+    end
+    msg = File.read(args[:msg_path])
+    mails = Notifier.admin(msg.html_safe, users, :subject => args[:subject])
+    count = 0
+    mails.each do |mail|
+      begin
+        mail.deliver
+        count += 1
+        if count % 100 == 0
+          puts "#{count} out of #{mails.count} delivered"
+        end
+      rescue
+        puts $!, $@
+      end
+    end
+    puts "#{count} out of #{mails.count} delivered"
+  end
+  
+end
\ No newline at end of file