include people names in the from field

5 files changed, 9 insertions, 9 deletions

diff --git a/app/mailers/notification_mailers/also_commented.rb b/app/mailers/notification_mailers/also_commented.rb
index b5cbff762..8afa2498d 100644
--- a/app/mailers/notification_mailers/also_commented.rb
+++ b/app/mailers/notification_mailers/also_commented.rb
@@ -8,7 +8,7 @@ module NotificationMailers
       @comment  = Comment.find_by_id(comment_id)
 
       if mail?
-        @headers[:from] = "[#{@comment.author.name} (Diaspora)] <#{AppConfig[:smtp_sender_address]}>"
+        @headers[:from] = "#{@comment.author.name} (Diaspora*) <#{AppConfig[:smtp_sender_address]}>"
         @headers[:subject] = truncate(@comment.parent.comment_email_subject, :length => TRUNCATION_LEN)
         @headers[:subject] = "Re: #{@headers[:subject]}"
       end
@@ -18,4 +18,4 @@ module NotificationMailers
       @recipient && @sender && @comment
     end
   end
-end
\ No newline at end of file
+end
diff --git a/app/mailers/notification_mailers/comment_on_post.rb b/app/mailers/notification_mailers/comment_on_post.rb
index 4dcf1bfee..89be9e980 100644
--- a/app/mailers/notification_mailers/comment_on_post.rb
+++ b/app/mailers/notification_mailers/comment_on_post.rb
@@ -7,9 +7,9 @@ module NotificationMailers
     def set_headers(comment_id)
       @comment = Comment.find(comment_id)
 
-      @headers[:from] = "[#{@comment.author.name} (Diaspora)] <#{AppConfig[:smtp_sender_address]}>"
+      @headers[:from] = "#{@comment.author.name} (Diaspora*) <#{AppConfig[:smtp_sender_address]}>"
       @headers[:subject] = truncate(@comment.parent.comment_email_subject, :length => TRUNCATION_LEN)
       @headers[:subject] = "Re: #{@headers[:subject]}"
     end
   end
-end
\ No newline at end of file
+end
diff --git a/app/mailers/notification_mailers/confirm_email.rb b/app/mailers/notification_mailers/confirm_email.rb
index e9c1d4c6f..fdd71ed79 100644
--- a/app/mailers/notification_mailers/confirm_email.rb
+++ b/app/mailers/notification_mailers/confirm_email.rb
@@ -1,8 +1,8 @@
 module NotificationMailers
   class ConfirmEmail < NotificationMailers::Base
     def set_headers
-      @headers[:to] = "\"#{recipient_name}\" <#{@recipient.unconfirmed_email}>"
+      @headers[:to] = "#{recipient_name} <#{@recipient.unconfirmed_email}>"
       @headers[:subject] = I18n.t('notifier.confirm_email.subject', :unconfirmed_email => @recipient.unconfirmed_email)
     end
   end
-end
\ No newline at end of file
+end
diff --git a/app/mailers/notification_mailers/private_message.rb b/app/mailers/notification_mailers/private_message.rb
index 69823f4f3..72fb46e35 100644
--- a/app/mailers/notification_mailers/private_message.rb
+++ b/app/mailers/notification_mailers/private_message.rb
@@ -7,9 +7,9 @@ module NotificationMailers
       @conversation = @message.conversation
       @participants = @conversation.participants
 
-      @headers[:from] = "[#{@message.author.name} (Diaspora)] <#{AppConfig[:smtp_sender_address]}>"
+      @headers[:from] = "#{@message.author.name} (Diaspora*) <#{AppConfig[:smtp_sender_address]}>"
       @headers[:subject] = @conversation.subject.strip
       @headers[:subject] = "Re: #{@headers[:subject]}" if @conversation.messages.size > 1
     end
   end
-end
\ No newline at end of file
+end
diff --git a/app/mailers/notification_mailers/started_sharing.rb b/app/mailers/notification_mailers/started_sharing.rb
index b5922cfff..e02c50e43 100644
--- a/app/mailers/notification_mailers/started_sharing.rb
+++ b/app/mailers/notification_mailers/started_sharing.rb
@@ -4,4 +4,4 @@ module NotificationMailers
       @headers[:subject] = I18n.t('notifier.started_sharing.subject', :name => @sender.name)
     end
   end
-end
\ No newline at end of file
+end