diff --git a/lib/tasks/email.rake b/lib/tasks/email.rake
index 87b5e03..957d9d4 100644
--- a/lib/tasks/email.rake
+++ b/lib/tasks/email.rake
@@ -165,5 +165,22 @@ END_DESC
       
       Redmine::POP3.check(pop_options, options)
     end
+    
+    desc "Send a test email to the user with the provided login name"
+    task :test, :login, :needs => :environment do |task, args|
+      include Redmine::I18n
+      abort l(:notice_email_error, "Please include the user login to test with. Example: login=examle-login") if args[:login].blank?
+
+      user = User.find_by_login(args[:login])
+      abort l(:notice_email_error, "User #{args[:login]} not found") unless user.logged?
+      
+      ActionMailer::Base.raise_delivery_errors = true
+      begin
+        Mailer.deliver_test(User.current)
+        puts l(:notice_email_sent, user.mail)
+      rescue Exception => e
+        abort l(:notice_email_error, e.message)
+      end
+    end
   end
 end