diff --git a/app/models/contact.rb b/app/models/contact.rb
index ee2b891..902ff96 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -32,14 +32,15 @@ class Contact < ActiveRecord::Base #WithoutTable
       if contact.receive_a_copy
         cc "#{contact.name} <#{contact.email}>"
       end
-      subject contact.subject
+      subject "[#{contact.dest.short_name(30)}] " + contact.subject
       body :name => contact.name,
         :email => contact.email,
         :city => contact.city,
         :state => contact.state,
         :message => contact.message,
         :environment => contact.dest.environment.name,
-        :url => url_for(:host => contact.dest.environment.default_hostname, :controller => 'home')
+        :url => url_for(:host => contact.dest.environment.default_hostname, :controller => 'home'),
+        :target => contact.dest.name
     end
   end
 
diff --git a/app/views/contact/sender/mail.rhtml b/app/views/contact/sender/mail.rhtml
index a30479b..49a11b2 100644
--- a/app/views/contact/sender/mail.rhtml
+++ b/app/views/contact/sender/mail.rhtml
@@ -1,8 +1,13 @@
-<%= _('Name: %s') % @name  %>
-<%= _('e-Mail: %s') % @email %>
-<% if @city || @state %>
-  <%= _('City and state: %s/%s') % [@city || '?', @state || '?'] %>
-<% end %>
+<%= _('This message was sent by %{sender} to %{target} on %{environment}.') %
+  {:sender => @name, :target => @target, :environment => @environment} %>
+<%= _('Below here are the informations about the user who sent this message:')%>
+<ul>
+  <li><%= content_tag('b', _('Name')+': ') + @name%></li>
+  <li><%= content_tag('b', _('Email')+': ') + @email%></li>
+  <% if @city || @state %>
+    <li><%= content_tag('b', _('City and state')+': ') + (@city || '?')+'/'+(@state || '?') %></li>
+  <% end %>
+</ul>
 
 <%= _('Message:') %>
 -------------------------------------------------------------------------------
--
libgit2 0.21.2