    cc = issue.cc[:]
    reply_to = to + cc
    if my_email in to and len(to) > 1:  # send_mail() wants a non-empty to list
+@@ -2196,7 +2201,7 @@
+   """/<issue>/draft_message - Retrieve, modify and delete draft messages."""
+   query = models.Message.gql(('WHERE issue = :1 AND sender = :2 '
+                               'AND draft = TRUE'),
+-                             request.issue, request.user.email())
++                             request.issue, request.user.email)
+   if query.count() == 0:
+     draft_message = None
+   else:
+@@ -2236,7 +2241,7 @@
+   """
+   if draft is None:
+     draft = models.Message(issue=request.issue, parent=request.issue,
+-                           sender=request.user.email(), draft=True)
++                           sender=request.user.email, draft=True)
+   draft.text = request.POST.get('reviewmsg')
+   draft.put()
+   return HttpResponse(draft.text, content_type='text/plain')
 @@ -2443,7 +2448,7 @@
  
  def _user_popup(request):

           elif email.count('@') != 1:
             raise db.BadValueError('Invalid email address: %s' % email)
           else:
@@ -1282,7 +1284,7 @@
 
     accounts = models.Account.all()

     accounts.order("lower_%s" % property);
     for account in accounts:
       if account.key() in added:
@@ -1893,7 +1895,7 @@
   template = 'mails/comment.txt'
   if request.user == issue.owner:
     if db.GqlQuery('SELECT * FROM Message WHERE ANCESTOR IS :1 AND sender = :2',
-                   issue, db.Email(request.user.email())).count(1) == 0:
+                   issue, db.Email(request.user.email)).count(1) == 0:
       template = 'mails/review.txt'
       files, patch = _get_affected_files(issue)
       context.update({'files': files, 'patch': patch, 'base': issue.base})
@@ -1913,16 +1915,16 @@
   if not request.POST.get('message_only', None):
     query = models.Message.gql(('WHERE issue = :1 AND sender = :2 '
                                 'AND draft = TRUE'), issue,
-                               request.user.email())
+                               request.user.email)
     draft_message = query.get()
   if request.method != 'POST':
     reviewers = issue.reviewers[:]
     cc = issue.cc[:]
