diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,10 +1,7 @@
-require 'tmail'
 require 'net/smtp'
 
 class UsersController < ApplicationController
 
-  #include MailHelperMethods
-
   before_filter :authenticate, :except => [:new, 
                                            :register, 
                                            :confirm, 
@@ -124,35 +121,46 @@
                              :login => user.login, 
                              :activation => user.activation_key)
     home_url = url_for(:controller => 'main', :action => 'index')
-    subject = "[#{contest_name}] Confirmation"
-    body = t('registration.email_body', {
-               :full_name => user.full_name,
-               :contest_name => contest_name,
-               :login => user.login,
-               :password => user.password,
-               :activation_url => activation_url,
-               :admin_email => admin_email
-             })
+    mail_subject = "[#{contest_name}] Confirmation"
+    mail_body = t('registration.email_body', {
+                    :full_name => user.full_name,
+                    :contest_name => contest_name,
+                    :login => user.login,
+                    :password => user.password,
+                    :activation_url => activation_url,
+                    :admin_email => admin_email
+                  })
 
-    logger.info body
+    logger.info mail_body
 
-    send_mail(user.email, subject, body)
+    Mail.deliver do
+      from admin_email
+      to user.email
+      subject mail_subject
+      body mail_body
+    end
   end
   
   def send_new_password_email(user)
     contest_name = GraderConfiguration['contest.name']
     admin_email = GraderConfiguration['system.admin_email']
-    subject = "[#{contest_name}] Password recovery"
-    body = t('registration.password_retrieval.email_body', {
-               :full_name => user.full_name,
-               :contest_name => contest_name,
-               :login => user.login,
-               :password => user.password,
-               :admin_email => admin_email
-             })
+    mail_subject = "[#{contest_name}] Password recovery"
+    mail_body = t('registration.password_retrieval.email_body', {
+                    :full_name => user.full_name,
+                    :contest_name => contest_name,
+                    :login => user.login,
+                    :password => user.password,
+                    :admin_email => admin_email
+                  })
 
-    logger.info body
-    send_mail(user.email, subject, body)
+    logger.info mail_body
+
+    Mail.deliver do
+      from admin_email
+      to user.email
+      subject mail_subject
+      body mail_body
+    end
   end
   
 end