diff --git a/app/views/contact/sender/mail.rhtml b/app/views/contact/sender/mail.rhtml
index 91917ce..817205d 100644
--- a/app/views/contact/sender/mail.rhtml
+++ b/app/views/contact/sender/mail.rhtml
@@ -8,8 +8,8 @@
     {:sender => @name, :target => @target, :environment => @environment} %></p>
     <%= _('Information about the user who sent this message:')%>
     <ul>
-      <li><%= content_tag('b', _('Name')+': ') + @name%></li>
-      <li><%= content_tag('b', _('Email')+': ') + @email%></li>
+      <li><%= content_tag('b', _('Name')+': ') + @name.to_s %></li>
+      <li><%= content_tag('b', _('Email')+': ') + @email.to_s %></li>
       <% if @city || @state %>
         <li><%= content_tag('b', _('City and state')+': ') + (@city || '?')+'/'+(@state || '?') %></li>
       <% end %>
diff --git a/test/unit/contact_sender_test.rb b/test/unit/contact_sender_test.rb
index 7b2dd64..a956a42 100644
--- a/test/unit/contact_sender_test.rb
+++ b/test/unit/contact_sender_test.rb
@@ -16,8 +16,8 @@ class ContactSenderTest < Test::Unit::TestCase
     ent.contact_email = 'contact@invalid.com'
     c = build(Contact, :dest => ent)
     response = Contact::Sender.deliver_mail(c)
-    assert_equal c.email, response.from
-    assert_equal c.subject, response.subject
+    assert_equal Environment.default.contact_email, response.from.to_s
+    assert_equal "[#{ent.name}] #{c.subject}", response.subject
   end
 
   should 'deliver mail to contact_email' do
--
libgit2 0.21.2