diff --git a/lib/codereview/codereview.py b/lib/codereview/codereview.py
index a26ec0ef9bd..f1dd67ca4ab 100644
--- a/lib/codereview/codereview.py
+++ b/lib/codereview/codereview.py
@@ -145,8 +145,10 @@ class CL(object):
 
 	def Subject(self): 
 		s = line1(self.desc)
+		if len(s) > 60:
+			s = s[0:55] + "..."
 		if self.name != "new":
-			s = "codereview %s: %s" % (self.name, s)
+			s = "code review %s: %s" % (self.name, s)
 		return s
 
 	def Upload(self, ui, repo, send_mail=False):