Index: reviews/email.py
===================================================================
--- reviews/email.py	(revision 1137)
+++ reviews/email.py	(working copy)
@@ -54,35 +54,30 @@
     """
     current_site = Site.objects.get(pk=settings.SITE_ID)
 
-    from_email = get_email_address_for_user(user)
+    from_email = r'''"%s %s (RB)" <%s>''' % (user.first_name, user.last_name, settings.DEFAULT_FROM_EMAIL)
 
-    recipient_table = {
-        from_email: 1,
-        get_email_address_for_user(review_request.submitter): 1,
-    }
+    recipients = set([get_email_address_for_user(review_request.submitter)])
 
     for u in review_request.target_people.all():
-        recipient_table[get_email_address_for_user(u)] = 1
+        recipients.add(get_email_address_for_user(u))
 
-    for group in review_request.target_groups.all():
-        for address in get_email_addresses_for_group(group):
-            recipient_table[address] = 1
-
     for profile in review_request.starred_by.all():
-        recipient_table[get_email_address_for_user(profile.user)] = 1
+        recipients.add(get_email_address_for_user(profile.user))
 
     if extra_recipients:
         for recipient in extra_recipients:
-            recipient_table[get_email_address_for_user(recipient)] = 1
+            recipients.add(get_email_address_for_user(recipient))
 
-    recipient_list = recipient_table.keys()
+    recipients.discard(get_email_address_for_user(user))
+
+    context['user'] = user
     context['domain'] = current_site.domain
     context['domain_method'] = settings.DOMAIN_METHOD
     context['review_request'] = review_request
     body = render_to_string(template_name, context)
 
     message = SpiffyEmailMessage(subject.strip(), body, from_email,
-                                 recipient_list, in_reply_to)
+                                 recipients, in_reply_to)
     message.send()
 
     return message.message_id
@@ -153,7 +148,8 @@
 
 def mail_review(user, review):
     """Sends an e-mail representing the supplied review."""
-    if not review.review_request.public:
+    request = review.review_request
+    if not request.public:
         return
 
     review.ordered_comments = \
@@ -161,10 +157,9 @@
 
     review.email_message_id = \
         send_review_mail(user,
-                         review.review_request,
-                         u"Re: Review Request: %s" %
-                         review.review_request.summary,
-                         review.review_request.email_message_id,
+                         request,
+                         u"[RB] Reviewed: %s" % request.summary,
+                         request.email_message_id,
                          None,
                          'reviews/review_email.txt',
                          {'review': review})
@@ -177,15 +172,15 @@
     Sends an e-mail representing the supplied reply to a review.
     """
     review = reply.base_reply_to
+    request = review.review_request
 
-    if not review.review_request.public:
+    if not request.public:
         return
 
     reply.email_message_id = \
         send_review_mail(user,
-                         review.review_request,
-                         u"Re: Review Request: %s" %
-                         review.review_request.summary,
+                         request,
+                         u"[RB] Replied: %s" % request.summary,
                          review.email_message_id,
                          harvest_people_from_review(review),
                          'reviews/reply_email.txt',