diff --git a/mitterlib/ui/helpers/gtk_messagegrid.py b/mitterlib/ui/helpers/gtk_messagegrid.py
index f128e3c..a05ed0b 100644
--- a/mitterlib/ui/helpers/gtk_messagegrid.py
+++ b/mitterlib/ui/helpers/gtk_messagegrid.py
@@ -408,7 +408,9 @@ class MessageGrid(gtk.ScrolledWindow, gobject.GObject):
         # reconnect the store and re-select the previously selected line
         self._grid.set_model(store)
         if iter:
+            path = store.get_path(iter)
             self._grid.get_selection().select_iter(iter)
+            self._grid.scroll_to_cell(path, None, False, 0, 0)
 
         self._grid.thaw_notify()
         self._grid.queue_draw()