diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index eacead013..a930b5467 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -817,12 +817,12 @@ class Mailer < ActionMailer::Base
       headers[:references] = @references_objects.collect {|o| "<#{self.class.message_id_for(o)}>"}.join(' ')
     end
 
+    set_language_if_valid @initial_language
     super headers do |format|
       format.text
       format.html unless Setting.plain_text_mail?
     end
 
-    set_language_if_valid @initial_language
   end
 
   def initialize(*args)
diff --git a/config/configuration.yml b/config/configuration.yml
index 5eba1c71d..87a54a976 100644
--- a/config/configuration.yml
+++ b/config/configuration.yml
@@ -215,11 +215,12 @@ production:
 # specific configuration options for development environment
 # that overrides the default ones
 development:
-  delivery_method: :smtp
-  smtp_settings:
-    address: mail.trustie.net
-    port: 25
-    domain: mail.trustie.net
-    authentication: :login
-    user_name: "mail@trustie.net"
-    password: "loong2010"
+  email_delivery:
+    delivery_method: :smtp
+    smtp_settings:
+      address: mail.trustie.net
+      port: 25
+      domain: mail.trustie.net
+      authentication: :login
+      user_name: "mail@trustie.net"
+      password: "loong2010"
diff --git a/lib/tasks/email.rake b/lib/tasks/email.rake
index 5f9bf7769..5126d7a69 100644
--- a/lib/tasks/email.rake
+++ b/lib/tasks/email.rake
@@ -186,9 +186,9 @@ END_DESC
 
       ActionMailer::Base.raise_delivery_errors = true
       begin
-        Mailer.with_synched_deliveries do
-          Mailer.test_email(user).deliver
-        end
+        # Mailer.with_synched_deliveries do
+          Mailer.test_email(user).deliver!
+        # end
         puts l(:notice_email_sent, user.mail)
       rescue Exception => e
         abort l(:notice_email_error, e.message)