            elif email.count('@') != 1:
              raise db.BadValueError('Invalid email address: %s' % email)
            else:
+@@ -1245,7 +1247,7 @@
+   for msg in issue.message_set.order('date'):
+     if not msg.draft:
+       messages.append(msg)
+-    elif msg.draft and request.user and msg.sender == request.user.email():
++    elif msg.draft and request.user and msg.sender == request.user.email:
+       has_draft_message = True
+   return respond(request, 'issue.html',
+                  {'issue': issue, 'patchsets': patchsets,
 @@ -1282,7 +1284,7 @@
  
      accounts = models.Account.all()

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

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