diff --git a/VERSION b/VERSION
index 46cdf1f3..ea953740 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 1.99.4 (2012-02-03 11:31:35) stable
+Version 1.99.4 (2012-02-04 09:49:34) stable
diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py
index 7c83bc5e..2043d64e 100644
--- a/gluon/sqlhtml.py
+++ b/gluon/sqlhtml.py
@@ -1297,6 +1297,8 @@ class SQLFORM(FORM):
 
     @staticmethod
     def build_query(fields,keywords):
+        from gluon import current
+        request = current.request
         if isinstance(keywords,(tuple,list)):
            keywords = keywords[0]
            request.vars.keywords = keywords
@@ -1781,7 +1783,13 @@ class SQLFORM(FORM):
                     classtr = 'odd'
                 numrec+=1
                 id = row[field_id]
-                tr = TR(_class=classtr)
+                if row_id:
+                    rid = row_id
+                    if callable(rid):
+                        rid = rid(row)
+                    tr = TR(_id=rid, _class='%s %s' % (classtr, 'with_id'))
+                else:
+                    tr = TR(_class=classtr)
                 if selectable:
                     tr.append(INPUT(_type="checkbox",_name="records",_value=id,
                                     value=request.vars.records))