diff --git a/app/mailers/notifier.rb b/app/mailers/notifier.rb
index 8ce7995b4..40a94a1f3 100644
--- a/app/mailers/notifier.rb
+++ b/app/mailers/notifier.rb
@@ -5,6 +5,6 @@ class Notifier < ActionMailer::Base
     @receiver = recipient
     @sender = sender
     mail(:to => "#{recipient.real_name} <#{recipient.email}>",
-    :subject => "new friend request from #{@sender.inspect}")
+    :subject => "new Diaspora* friend request from #{@sender.real_name}")
   end
 end
diff --git a/app/views/notifier/new_request.html.haml b/app/views/notifier/new_request.html.haml
index 54cee3ddd..71932dc44 100644
--- a/app/views/notifier/new_request.html.haml
+++ b/app/views/notifier/new_request.html.haml
@@ -51,8 +51,9 @@
         = "#{@sender.real_name} (#{@sender.diaspora_handle})"
         just sent you a friend request on Diaspora*
         You should really think about checking it out.
-
-        = link_to "sign in here", new_user_session_path
-
+        %br
+        = link_to "sign in here", new_user_session_url
+        %br
         love, 
+        %br
         the diaspora email robot
diff --git a/app/views/notifier/new_request.text.haml b/app/views/notifier/new_request.text.haml
index 1c1505f74..8ab5bc570 100644
--- a/app/views/notifier/new_request.text.haml
+++ b/app/views/notifier/new_request.text.haml
@@ -3,7 +3,7 @@
 just sent you a friend request on Diaspora*
 You should really think about checking it out.
 
-= "sign in here: #{new_user_session_path}"
+= "sign in here: #{new_user_session_url}"
 
 love, 
 the diaspora email robot