diff -rupN GNUMail/Framework/GNUMail/EditWindowController.m GNUMail.tk/Framework/GNUMail/EditWindowController.m
--- GNUMail/Framework/GNUMail/EditWindowController.m	2007-04-23 10:04:51.000000000 +0200
+++ GNUMail.tk/Framework/GNUMail/EditWindowController.m	2009-08-22 22:06:04.000000000 +0200
@@ -364,7 +364,7 @@
 - (void) dealloc
 {
   NSDebugLog(@"EditWindowController: -dealloc");
-  
+  [[self window] setDelegate:nil];
   [[NSNotificationCenter defaultCenter] removeObserver: self];
 
 #ifdef MACOSX
diff -rupN GNUMail/Framework/GNUMail/MailWindowController.m GNUMail.tk/Framework/GNUMail/MailWindowController.m
--- GNUMail/Framework/GNUMail/MailWindowController.m	2007-04-09 10:03:46.000000000 +0200
+++ GNUMail.tk/Framework/GNUMail/MailWindowController.m	2009-08-25 16:17:24.000000000 +0200
@@ -310,7 +310,7 @@
 - (void) dealloc
 {
   NSDebugLog(@"MailWindowController: -dealloc");
-  
+  [[self window] setDelegate: nil];
   [[NSNotificationCenter defaultCenter] 
     removeObserver: mailHeaderCell
     name: @"NSViewFrameDidChangeNotification" 
diff -rupN GNUMail/Framework/GNUMail/MessageViewWindowController.m GNUMail.tk/Framework/GNUMail/MessageViewWindowController.m
--- GNUMail/Framework/GNUMail/MessageViewWindowController.m	2007-03-12 10:03:42.000000000 +0100
+++ GNUMail.tk/Framework/GNUMail/MessageViewWindowController.m	2009-08-22 22:05:13.000000000 +0200
@@ -129,7 +129,7 @@
 - (void) dealloc
 {
   NSDebugLog(@"MessageViewWindowController: dealloc called for message window: %@", [message subject]);
-  
+  [[self window] setDelegate: nil];
   [[NSNotificationCenter defaultCenter] removeObserver: mailHeaderCell
 					name: @"NSViewFrameDidChangeNotification" 
 					object: textView];