    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):

     accounts.order("lower_%s" % property);
     for account in accounts:
       if account.key() in added:
@@ -1918,11 +1920,11 @@
   if request.method != 'POST':
     reviewers = issue.reviewers[:]
     cc = issue.cc[:]

   if popup_html is None:
     num_issues_created = db.GqlQuery(
       'SELECT * FROM Issue '
@@ -2452,14 +2457,14 @@
     num_issues_reviewed = db.GqlQuery(
       'SELECT * FROM Issue '
       'WHERE closed = FALSE AND reviewers = :1',
-      user.email()).count()
+      user.email).count()
 
-    user.nickname = models.Account.get_nickname_for_email(user.email())
+    user.nickname = models.Account.get_nickname_for_email(user.email)
