--- reviews/tests.py	(revision 694)
+++ reviews/tests.py	(working copy)
@@ -7,7 +7,7 @@
 from django.test import TestCase
 
 from reviewboard.reviews.email import get_email_address_for_user, \
-                                      get_email_address_for_group, \
+                                      get_email_addresses_for_group, \
                                       mail_review_request, mail_review, \
                                       mail_reply
 from reviewboard.reviews.models import Group, ReviewRequest, Review
@@ -90,8 +90,8 @@
             self.assert_(get_email_address_for_user(
                 User.objects.get(username=user)) in recipient_list)
 
-        for group in group_list:
-            self.assert_(get_email_address_for_group(
-                Group.objects.get(name=group)) in recipient_list)
+        for group in Group.objects.filter(name__in=group_list):
+            for address in get_email_addresses_for_group(group):
+                self.assert_(address in recipient_list)
 
 
--- reviews/models.py	(revision 694)
+++ reviews/models.py	(working copy)
@@ -16,7 +16,7 @@
 class Group(models.Model):
     name = models.CharField(maxlength=64)
     display_name = models.CharField(maxlength=64)
-    mailing_list = models.EmailField()
+    mailing_list = models.EmailField(blank=True)
     users = models.ManyToManyField(User, core=False, blank=True,
                                    filter_interface=models.HORIZONTAL)
 
--- reviews/email.py	(revision 694)
+++ reviews/email.py	(working copy)
@@ -14,8 +14,12 @@
         return '%s <%s>' % (u.get_full_name(), u.email)
 
 
-def get_email_address_for_group(g):
-    return '%s <%s>' % (g.display_name, g.mailing_list)
+def get_email_addresses_for_group(g):
+    if g.mailing_list:
+        return ['%s <%s>' % (g.display_name, g.mailing_list)]
+    else:
+        return [get_email_address_for_user(u) \
+                for u in g.users.all()]
 
 
 class SpiffyEmailMessage(EmailMessage):
@@ -55,7 +59,8 @@
         recipient_table[get_email_address_for_user(u)] = 1
 
     for group in review_request.target_groups.all():
-        recipient_table[get_email_address_for_group(group)] = 1
+        for address in get_email_addresses_for_group(group):
+            recipient_table[address] = 1
 
     if extra_recipients:
         for recipient in extra_recipients: