--- Framework/GNUMail/MailWindowController.m.orig	2007-06-22 17:21:42.000000000 +0200
+++ Framework/GNUMail/MailWindowController.m	2007-06-22 17:23:39.000000000 +0200
@@ -2372,14 +2372,8 @@
 
   // We set any vertical mouse motion has being dragging
   [dataView setVerticalMotionCanBeginDrag: NO];
-   
-  // FIXME: Should we really make that work under OS X and MingW?
-  //        Find the right * y ratio
-#if !defined(MACOSX) && !defined(__MINGW32__)
-  // We set the table row height, depending on the current font
-  aSize = [[NSFont seenMessageFont] maximumAdvancement];
-  [dataView setRowHeight: aSize.height];
-#endif
+
+  [dataView setRowHeight: [[NSFont seenMessageFont] defaultLineHeightForFont]];
 
   // We load the right set of columns
   [self _reloadTableColumns: self];
@@ -2854,16 +2848,7 @@
 //
 - (void) _fontValuesHaveChanged
 {
-  // FIXME: Should we really make that work under OS X?
-  //        Find the right * y ratio
-#ifndef MACOSX
-  NSSize aSize;
-  
-  // We set the table row height, depending on the current font
-  aSize = [[NSFont seenMessageFont] maximumAdvancement];
-  [dataView setRowHeight: aSize.height];
-#endif
-
+  [dataView setRowHeight: [[NSFont seenMessageFont] defaultLineHeightForFont]];
   [self _showMessage: self];
 }