diff --git a/app/models/task_mailer.rb b/app/models/task_mailer.rb
index 2109b16..0021386 100644
--- a/app/models/task_mailer.rb
+++ b/app/models/task_mailer.rb
@@ -14,7 +14,7 @@ class TaskMailer < ActionMailer::Base
 
     recipients task.target.contact_email
 
-    from task.requestor.environment.contact_email
+    from self.class.generate_from(task)
     subject task.description
     body :requestor => task.requestor.name,
       :target => task.target.name,
@@ -38,7 +38,7 @@ class TaskMailer < ActionMailer::Base
     text = extract_message(message)
 
     recipients task.requestor.email
-    from task.requestor.environment.contact_email
+    from self.class.generate_from(task)
     subject task.description
     body :requestor => task.requestor.name,
       :message => text,
@@ -46,4 +46,8 @@ class TaskMailer < ActionMailer::Base
       :url => url_for(:host => task.requestor.environment.default_hostname, :controller => 'home')
   end
 
+  def self.generate_from(task)
+    "#{task.requestor.environment.name} <#{task.requestor.environment.contact_email}>"
+  end
+
 end
diff --git a/app/views/account/new_password.rhtml b/app/views/account/new_password.rhtml
index de70896..6638260 100644
--- a/app/views/account/new_password.rhtml
+++ b/app/views/account/new_password.rhtml
@@ -1,7 +1,7 @@
 <h1><%= _('Enter new password') %></h1>
 
 <p>
-<%= _("Hello, %s! Please enter your new password in the form below.") % @change_password.requestor.identifier %>
+<%= _("Hello, %s! Please enter your new password in the form below.") % @change_password.requestor.name %>
 </p>
 
 <%= error_messages_for :change_password %>
diff --git a/po/pt_BR/noosfero.po b/po/pt_BR/noosfero.po
index f814853..2abcdca 100644
--- a/po/pt_BR/noosfero.po
+++ b/po/pt_BR/noosfero.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: noosfero 0.10.0\n"
 "POT-Creation-Date: 2008-06-11 14:42-0300\n"
-"PO-Revision-Date: 2008-06-13 16:35-0300\n"
+"PO-Revision-Date: 2008-06-13 17:52-0300\n"
 "Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -1949,7 +1949,7 @@ msgstr "Não, eu quero ficar."
 #: app/views/account/new_password.rhtml:1
 #: app/views/account/new_password.rhtml:11
 msgid "Enter new password"
-msgstr "Enter com a nova senha"
+msgstr "Entre com a nova senha"
 
 #: app/views/account/new_password.rhtml:4
 msgid "Hello, %s! Please enter your new password in the form below."
diff --git a/test/unit/task_mailer_test.rb b/test/unit/task_mailer_test.rb
index d6bd144..e341c89 100644
--- a/test/unit/task_mailer_test.rb
+++ b/test/unit/task_mailer_test.rb
@@ -29,7 +29,7 @@ class TaskMailerTest < Test::Unit::TestCase
     environment = mock()
     environment.expects(:contact_email).returns('sender@example.com')
     environment.expects(:default_hostname).returns('example.com')
-    environment.expects(:name).returns('example')
+    environment.expects(:name).returns('example').at_least_once
 
     task.expects(:requestor).returns(requestor).at_least_once
     requestor.expects(:environment).returns(environment).at_least_once
@@ -50,7 +50,7 @@ class TaskMailerTest < Test::Unit::TestCase
     environment = mock()
     environment.expects(:contact_email).returns('sender@example.com')
     environment.expects(:default_hostname).returns('example.com')
-    environment.expects(:name).returns('example')
+    environment.expects(:name).returns('example').at_least_once
 
     task.expects(:requestor).returns(requestor).at_least_once
     requestor.expects(:environment).returns(environment).at_least_once
@@ -72,7 +72,7 @@ class TaskMailerTest < Test::Unit::TestCase
     environment = mock()
     environment.expects(:contact_email).returns('sender@example.com')
     environment.expects(:default_hostname).returns('example.com')
-    environment.expects(:name).returns('example')
+    environment.expects(:name).returns('example').at_least_once
 
     task.expects(:requestor).returns(requestor).at_least_once
     requestor.expects(:environment).returns(environment).at_least_once
@@ -94,7 +94,7 @@ class TaskMailerTest < Test::Unit::TestCase
     environment = mock()
     environment.expects(:contact_email).returns('sender@example.com')
     environment.expects(:default_hostname).returns('example.com')
-    environment.expects(:name).returns('example')
+    environment.expects(:name).returns('example').at_least_once
 
     task.expects(:requestor).returns(requestor).at_least_once
     task.expects(:target).returns(target).at_least_once
@@ -103,6 +103,19 @@ class TaskMailerTest < Test::Unit::TestCase
     TaskMailer.deliver_target_notification(task, 'the message')
   end
 
+  should 'use environment name and contact email' do
+    task = mock
+    requestor = mock
+    environment = mock
+    environment.expects(:name).returns('My name')
+    environment.expects(:contact_email).returns('email@example.com')
+
+    task.expects(:requestor).returns(requestor).at_least_once
+    requestor.expects(:environment).returns(environment).at_least_once
+
+    assert_equal 'My name <email@example.com>', TaskMailer.generate_from(task)
+  end
+
 
   private
     def read_fixture(action)
--
libgit2 0.21.2