diff --git a/app/controllers/public/account_controller.rb b/app/controllers/public/account_controller.rb
index 1e5c2b4..a7cf41d 100644
--- a/app/controllers/public/account_controller.rb
+++ b/app/controllers/public/account_controller.rb
@@ -193,7 +193,7 @@ class AccountController < ApplicationController
         else
           @change_password.errors[:base] << _('Could not find any user with %s equal to "%s".') % [fields_label, params[:value]]
         end
-      rescue ActiveRecord::RecordInvald
+      rescue ActiveRecord::RecordInvalid
         @change_password.errors[:base] << _('Could not perform password recovery for the user.')
       end
     end
diff --git a/app/models/task.rb b/app/models/task.rb
index f74bc73..ec9c238 100644
--- a/app/models/task.rb
+++ b/app/models/task.rb
@@ -286,7 +286,7 @@ class Task < ActiveRecord::Base
   def send_notification(action)
     if sends_email?
       if self.requestor
-         TaskMailer.generic_message("task_#{action}", self)
+        TaskMailer.generic_message("task_#{action}", self).deliver
       end
     end
   end
diff --git a/app/views/task_mailer/generic_message.text.erb b/app/views/task_mailer/generic_message.text.erb
new file mode 100644
index 0000000..77a9d9e
--- /dev/null
+++ b/app/views/task_mailer/generic_message.text.erb
@@ -0,0 +1 @@
+<%= @message %>
diff --git a/test/unit/task_test.rb b/test/unit/task_test.rb
index 1166e9c..27f9b5a 100644
--- a/test/unit/task_test.rb
+++ b/test/unit/task_test.rb
@@ -29,7 +29,9 @@ class TaskTest < ActiveSupport::TestCase
   end
 
   def test_should_call_perform_in_finish
-    TaskMailer.expects(:generic_message).with('task_finished', anything)
+    mail = mock
+    mail.expects(:deliver)
+    TaskMailer.expects(:generic_message).with('task_finished', anything).returns(mail)
     t = Task.create
     t.requestor = sample_user
     t.expects(:perform)
@@ -38,7 +40,9 @@ class TaskTest < ActiveSupport::TestCase
   end
 
   def test_should_have_cancelled_status_after_cancel
-    TaskMailer.expects(:generic_message).with('task_cancelled', anything)
+    mail = mock
+    mail.expects(:deliver)
+    TaskMailer.expects(:generic_message).with('task_cancelled', anything).returns(mail)
     t = Task.create
     t.requestor = sample_user
     t.cancel
@@ -54,7 +58,9 @@ class TaskTest < ActiveSupport::TestCase
     t = Task.create
     t.requestor = sample_user
 
-    TaskMailer.expects(:generic_message).with('task_finished', t)
+    mail = mock
+    mail.expects(:deliver)
+    TaskMailer.expects(:generic_message).with('task_finished', t).returns(mail)
 
     t.finish
   end
@@ -63,7 +69,9 @@ class TaskTest < ActiveSupport::TestCase
     t = Task.create
     t.requestor = sample_user
 
-    TaskMailer.expects(:generic_message).with('task_cancelled', t)
+    mail = mock
+    mail.expects(:deliver)
+    TaskMailer.expects(:generic_message).with('task_cancelled', t).returns(mail)
 
     t.cancel
   end
@@ -93,7 +101,9 @@ class TaskTest < ActiveSupport::TestCase
     task = Task.new
     task.requestor = sample_user
 
-    TaskMailer.expects(:generic_message).with('task_created', task)
+    mail = mock
+    mail.expects(:deliver)
+    TaskMailer.expects(:generic_message).with('task_created', task).returns(mail)
     task.save!
   end
 
@@ -281,7 +291,9 @@ class TaskTest < ActiveSupport::TestCase
     task.requestor = sample_user
     task.save!
 
-    TaskMailer.expects(:generic_message).with('task_activated', task)
+    mail = mock
+    mail.expects(:deliver)
+    TaskMailer.expects(:generic_message).with('task_activated', task).returns(mail)
     task.activate
   end
 
--
libgit2 0.21.2