Updated actionmailer classes and API.

app/controllers/feedback_controller.rb

@@ -9,7 +9,7 @@ class FeedbackController < ApplicationController
 
   def create
     unless params[:message].blank?
-      Mailer.deliver_feedback(current_user, params[:message])
+      Mailer.feedback(current_user, params[:message]).deliver
     end
 
     render :update do |page|

app/controllers/login_controller.rb

@@ -53,7 +53,7 @@ class LoginController < ApplicationController
       user.reset_password_token = user.new_random_password(16)
       user.reset_password_expires = Time.now.advance(:days => 2)
       if user.save
-        email = Mailer.deliver_reset_password(user)
+        email = Mailer.reset_password(user).deliver
         logger.debug("Sent password reset email to #{user.email}.")
       end
     end