diff --git a/mitterlib/ui/ui_pygtk.py b/mitterlib/ui/ui_pygtk.py
index 04458c1..0a021e9 100644
--- a/mitterlib/ui/ui_pygtk.py
+++ b/mitterlib/ui/ui_pygtk.py
@@ -278,7 +278,8 @@ class Interface(object):
         self._grid.connect('cursor-changed', self._message_selected)
         self._grid.connect('button-press-event', self._click_message)
         self._grid.connect('popup-menu', self._message_popup)   # Menu button
-        self._grid.connect('cursor-changed', self._mark_message_read)
+        self._grid.connect('cursor-changed', self._mark_message_read,
+                '_new_message_count')
 
         scrolled_window = gtk.ScrolledWindow()
         scrolled_window.set_policy(gtk.POLICY_NEVER, gtk.POLICY_ALWAYS)
@@ -986,8 +987,11 @@ class Interface(object):
         if message.read:
             return True
 
+        # Do it generically, so we can reuse this function to both grids
+        counter = getattr(self, user_data)
+        setattr(self, user_data, counter - 1)
+
         message.read = True
-        self._new_message_count -= 1
         self._message_count_updated()
         return True