      accounts.order("lower_%s" % property);
      for account in accounts:
        if account.key() in added:
-@@ -1918,11 +1920,11 @@
+@@ -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[:]

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

   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)
